Adopt to new configuration variable name scheme of Unikraft

Adopts to the new configuration variable name scheme introduced
with latest Unikraft build system (see patch de27b01: "build:
add prefix CONFIG_ to every kconfig symbol")

Signed-off-by: Sharan Santhanam <sharan.santhanam@neclab.eu>

diff --git a/Makefile.uk b/Makefile.uk
index b95584e08f793825b89510c0aa4d756975442eba..fc76c49d9f36b05b70acfc6aeb545b4cea049d62 100644 (file)
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -37,7 +37,7 @@
 ################################################################################
 # Library registration
 ################################################################################
-$(eval $(call addlib_s,liblwip,$(LIBLWIP)))
+$(eval $(call addlib_s,liblwip,$(CONFIG_LIBLWIP)))
 
 ################################################################################
 # Sources
@@ -56,8 +56,8 @@ LIBLWIP_EXTRACTED=$(LIBLWIP_ORIGIN)/$(LIBLWIP_ZIPNAME)/src
 ################################################################################
 # Library includes
 ################################################################################
-CINCLUDES-y += -I$(LIBLWIP_BASE)/include -I$(LIBLWIP_EXTRACTED)/include
-CXXINCLUDES-y += -I$(LIBLWIP_BASE)/include -I$(LIBLWIP_EXTRACTED)/include
+CINCLUDES-$(CONFIG_LIBLWIP)   += -I$(LIBLWIP_BASE)/include -I$(LIBLWIP_EXTRACTED)/include
+CXXINCLUDES-$(CONFIG_LIBLWIP) += -I$(LIBLWIP_BASE)/include -I$(LIBLWIP_EXTRACTED)/include
 
 ################################################################################
 # Global flags
@@ -98,11 +98,11 @@ LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/core/raw.c
 LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/core/stats.c
 LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/core/sys.c
 LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/core/timeouts.c
-LIBLWIP_SRCS-$(LWIP_DNS) += $(LIBLWIP_EXTRACTED)/core/dns.c
-LIBLWIP_SRCS-$(LWIP_TCP) += $(LIBLWIP_EXTRACTED)/core/tcp.c
-LIBLWIP_SRCS-$(LWIP_TCP) += $(LIBLWIP_EXTRACTED)/core/tcp_in.c
-LIBLWIP_SRCS-$(LWIP_TCP) += $(LIBLWIP_EXTRACTED)/core/tcp_out.c
-LIBLWIP_SRCS-$(LWIP_UDP) += $(LIBLWIP_EXTRACTED)/core/udp.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_DNS) += $(LIBLWIP_EXTRACTED)/core/dns.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_TCP) += $(LIBLWIP_EXTRACTED)/core/tcp.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_TCP) += $(LIBLWIP_EXTRACTED)/core/tcp_in.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_TCP) += $(LIBLWIP_EXTRACTED)/core/tcp_out.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_UDP) += $(LIBLWIP_EXTRACTED)/core/udp.c
 
 ################################################################################
 # APIs
@@ -114,70 +114,70 @@ LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/api/netbuf.c
 LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/api/netdb.c
 LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/api/netifapi.c
 LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/api/tcpip.c
-LIBLWIP_SRCS-$(LWIP_SOCKET) += $(LIBLWIP_EXTRACTED)/api/sockets.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_SOCKET) += $(LIBLWIP_EXTRACTED)/api/sockets.c
 
 ################################################################################
 # NETIF Helpers
 ################################################################################
 LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/netif/ethernet.c
-LIBLWIP_SRCS-$(LWIP_SLIP) += $(LIBLWIP_EXTRACTED)/netif/slipif.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_SLIP) += $(LIBLWIP_EXTRACTED)/netif/slipif.c
 LIBLWIP_SRCS-y += $(LIBLWIP_EXTRACTED)/netif/lowpan6.c
 
 ################################################################################
 # IPv4
 ################################################################################
-LIBLWIP_SRCS-$(LWIP_AUTOIP)  += $(LIBLWIP_EXTRACTED)/core/ipv4/autoip.c
-LIBLWIP_SRCS-$(LWIP_DHCP)    += $(LIBLWIP_EXTRACTED)/core/ipv4/dhcp.c
-LIBLWIP_SRCS-$(LWIP_IPV4)    += $(LIBLWIP_EXTRACTED)/core/ipv4/etharp.c
-LIBLWIP_SRCS-$(LWIP_IPV4)    += $(LIBLWIP_EXTRACTED)/core/ipv4/icmp.c
-LIBLWIP_SRCS-$(LWIP_IPV4)    += $(LIBLWIP_EXTRACTED)/core/ipv4/igmp.c
-LIBLWIP_SRCS-$(LWIP_IPV4)    += $(LIBLWIP_EXTRACTED)/core/ipv4/ip4_frag.c
-LIBLWIP_SRCS-$(LWIP_IPV4)    += $(LIBLWIP_EXTRACTED)/core/ipv4/ip4.c
-LIBLWIP_SRCS-$(LWIP_IPV4)    += $(LIBLWIP_EXTRACTED)/core/ipv4/ip4_addr.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_AUTOIP)  += $(LIBLWIP_EXTRACTED)/core/ipv4/autoip.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_DHCP)    += $(LIBLWIP_EXTRACTED)/core/ipv4/dhcp.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_IPV4)    += $(LIBLWIP_EXTRACTED)/core/ipv4/etharp.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_IPV4)    += $(LIBLWIP_EXTRACTED)/core/ipv4/icmp.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_IPV4)    += $(LIBLWIP_EXTRACTED)/core/ipv4/igmp.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_IPV4)    += $(LIBLWIP_EXTRACTED)/core/ipv4/ip4_frag.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_IPV4)    += $(LIBLWIP_EXTRACTED)/core/ipv4/ip4.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_IPV4)    += $(LIBLWIP_EXTRACTED)/core/ipv4/ip4_addr.c
 
 ################################################################################
 # IPv6
 ################################################################################
-LIBLWIP_SRCS-$(LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/dhcp6.c
-LIBLWIP_SRCS-$(LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/ethip6.c
-LIBLWIP_SRCS-$(LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/icmp6.c
-LIBLWIP_SRCS-$(LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/inet6.c
-LIBLWIP_SRCS-$(LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/ip6.c
-LIBLWIP_SRCS-$(LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/ip6_addr.c
-LIBLWIP_SRCS-$(LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/ip6_frag.c
-LIBLWIP_SRCS-$(LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/mld6.c
-LIBLWIP_SRCS-$(LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/nd6.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/dhcp6.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/ethip6.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/icmp6.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/inet6.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/ip6.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/ip6_addr.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/ip6_frag.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/mld6.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_IPV6) += $(LIBLWIP_EXTRACTED)/core/ipv6/nd6.c
 
 ################################################################################
 # Lwip code - PPP
 ################################################################################
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/auth.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/ccp.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/chap-md5.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/chap_ms.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/chap-new.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/demand.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/eap.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/ecp.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/eui64.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/fsm.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/ipcp.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/ipv6cp.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/lcp.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/magic.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/mppe.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/multilink.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/ppp.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/pppapi.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/pppcrypt.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/pppoe.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/pppol2tp.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/pppos.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/upap.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/utils.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/vj.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/polarssl/arc4.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/polarssl/des.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/polarssl/md4.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/polarssl/md5.c
-LIBLWIP_SRCS-$(LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/polarssl/sha1.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/auth.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/ccp.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/chap-md5.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/chap_ms.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/chap-new.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/demand.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/eap.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/ecp.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/eui64.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/fsm.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/ipcp.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/ipv6cp.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/lcp.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/magic.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/mppe.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/multilink.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/ppp.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/pppapi.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/pppcrypt.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/pppoe.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/pppol2tp.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/pppos.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/upap.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/utils.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/vj.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/polarssl/arc4.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/polarssl/des.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/polarssl/md4.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/polarssl/md5.c
+LIBLWIP_SRCS-$(CONFIG_LWIP_PPP) += $(LIBLWIP_EXTRACTED)/netif/ppp/polarssl/sha1.c

diff --git a/include/arch/sys_arch.h b/include/arch/sys_arch.h
index ce1d47b87054d1d0d56ceef737d1766de5be2b40..3b1fbef40d6af1245f902ecf8254dd7dc9a42bc5 100644 (file)
--- a/include/arch/sys_arch.h
+++ b/include/arch/sys_arch.h
@@ -16,13 +16,13 @@
 #include <uk/mutex.h>
 #include <uk/semaphore.h>
 #include <uk/mbox.h>
-#if LIBUKSCHED
+#if CONFIG_LIBUKSCHED
 #include <uk/thread.h>
-#endif
+#endif /* CONFIG_LIBUKSCHED */
 
-#if LWIP_SOCKET && HAVE_LIBC
+#if CONFIG_LWIP_SOCKET && CONFIG_HAVE_LIBC
 #include <fcntl.h>
-#endif
+#endif /* CONFIG_LWIP_SOCKET && CONFIG_HAVE_LIBC */
 
 #define SYS_SEM_NULL   NULL
 #define SYS_MUTEX_NULL NULL
@@ -44,9 +44,9 @@ typedef struct {
        int valid;
 } sys_mbox_t;
 
-#if LIBUKSCHED
+#if CONFIG_LIBUKSCHED
 typedef struct uk_thread *sys_thread_t;
-#endif
+#endif /* CONFIG_LIBUKSCHED */
 
 typedef unsigned long sys_prot_t;
 

diff --git a/include/lwipopts.h b/include/lwipopts.h
index 4489eb31c01a3d69360fb8998c14139315871ebb..c6cc0bcce26838fe0ecfd1e5ae9363d379a28415 100644 (file)
--- a/include/lwipopts.h
+++ b/include/lwipopts.h
@@ -21,7 +21,7 @@
 #define SYS_LIGHTWEIGHT_PROT 1
 
 /* provide malloc/free by Unikraft */
-#if LWIP_HEAP /* default */
+#if CONFIG_LWIP_HEAP /* default */
   /* Only use malloc/free for lwIP.
    * Every allocation is done by the heap.
    * Note: This setting results in the smallest binary
@@ -30,7 +30,7 @@
    */
   #define MEM_LIBC_MALLOC 1 /* enable heap */
   #define MEMP_MEM_MALLOC 1 /* pool allocations via malloc (thus not from pool in data segment) */
-#elif LWIP_POOLS
+#elif CONFIG_LWIP_POOLS
   /* This is the default configuration (mixed).
    * Pools are used for pool allocations and the heap
    * is used for all the rest of allocations.
@@ -102,7 +102,7 @@ void sys_free(void *ptr);
 /*
  * TCP options
  */
-#define TCP_MSS LWIP_TCP_MSS
+#define TCP_MSS CONFIG_LWIP_TCP_MSS
 
 
 #define TCP_CALCULATE_EFF_SEND_MSS 1
@@ -110,13 +110,14 @@ void sys_free(void *ptr);
 
 
 
-#if LWIP_WND_SCALE
+#if CONFIG_LWIP_WND_SCALE
 /*
  * Maximum window and scaling factor
  * Optimal settings for RX performance are:
  *     TCP_WND         262143
  *     TCP_RCV_SCALE   5
  */
+#define LWIP_WND_SCALE  1
 #if defined CONFIG_LWIP_WND_SCALE_FACTOR && CONFIG_LWIP_WND_SCALE_FACTOR >= 1
 #define TCP_RCV_SCALE CONFIG_LWIP_WND_SCALE_FACTOR /* scaling factor 0..14 */
 #else
@@ -125,7 +126,7 @@ void sys_free(void *ptr);
 #define TCP_WND 262142
 #define TCP_SND_BUF ( 1024 * 1024 )
 
-#else /* LWIP_WND_SCALE */
+#else /* CONFIG_LWIP_WND_SCALE */
 /*
  * Options when no window scaling  is enabled
  */
@@ -145,8 +146,8 @@ void sys_free(void *ptr);
 /*
  * DNS options
  */
-#define DNS_MAX_SERVERS LWIP_DNS_MAX_SERVERS
-#define DNS_TABLE_SIZE LWIP_DNS_TABLE_SIZE
+#define DNS_MAX_SERVERS CONFIG_LWIP_DNS_MAX_SERVERS
+#define DNS_TABLE_SIZE CONFIG_LWIP_DNS_TABLE_SIZE
 #define DNS_LOCAL_HOST_LIST 1
 #define DNS_LOCAL_HOSTLIST_IS_DYNAMIC 1
 
@@ -167,83 +168,83 @@ void sys_free(void *ptr);
 /*
  * Checksum options
  */
-#define CHECKSUM_GEN_IP LWIP_TXCHECKSUM
-#define CHECKSUM_GEN_IP6 LWIP_TXCHECKSUM
-#define CHECKSUM_GEN_ICMP LWIP_TXCHECKSUM
-#define CHECKSUM_GEN_ICMP6 LWIP_TXCHECKSUM
-#define CHECKSUM_GEN_UDP LWIP_TXCHECKSUM
-#define CHECKSUM_GEN_TCP LWIP_TXCHECKSUM
+#define CHECKSUM_GEN_IP CONFIG_LWIP_TXCHECKSUM
+#define CHECKSUM_GEN_IP6 CONFIG_LWIP_TXCHECKSUM
+#define CHECKSUM_GEN_ICMP CONFIG_LWIP_TXCHECKSUM
+#define CHECKSUM_GEN_ICMP6 CONFIG_LWIP_TXCHECKSUM
+#define CHECKSUM_GEN_UDP CONFIG_LWIP_TXCHECKSUM
+#define CHECKSUM_GEN_TCP CONFIG_LWIP_TXCHECKSUM
 #define LWIP_CHECKSUM_ON_COPY 1
 
 /* Checksum checking is offloaded to the host (lwip-net is a virtual interface)
  * TODO: better solution is when netfront forwards checksum flags to lwIP */
-#define CHECKSUM_CHECK_IP LWIP_RXCHECKSUM
-#define CHECKSUM_CHECK_UDP LWIP_RXCHECKSUM
-#define CHECKSUM_CHECK_TCP LWIP_RXCHECKSUM
-#define CHECKSUM_CHECK_ICMP LWIP_RXCHECKSUM
-#define CHECKSUM_CHECK_ICMP6 LWIP_RXCHECKSUM
-#define CHECKSUM_CHECK_TCP LWIP_RXCHECKSUM
-
-#ifdef LWIP_MAINLOOP_DEBUG
-#define IP_DEBUG LWIP_DBG_ON
-#define TCPIP_DEBUG LWIP_DBG_ON
-#define TIMERS_DEBUG LWIP_DBG_ON
-#endif /* LWIP_MAINLOOP_DEBUG */
-
-#ifdef LWIP_IF_DEBUG
-#define NETIF_DEBUG LWIP_DBG_ON
-#endif /* LWIP_IF_DEBUG */
-
-#ifdef LWIP_IP_DEBUG
-#define IP_DEBUG LWIP_DBG_ON
-#define IP6_DEBUG LWIP_DBG_ON
-#define IP_REASS_DEBUG LWIP_DBG_ON
-#endif /* LWIP_IP_DEBUG */
-
-#ifdef LWIP_UDP_DEBUG
-#define UDP_DEBUG LWIP_DBG_ON
-#endif /* LWIP_UDP_DEBUG */
-
-#ifdef LWIP_TCP_DEBUG
-#define TCP_DEBUG LWIP_DBG_ON
-#define TCP_FR_DEBUG LWIP_DBG_ON
-#define TCP_RTO_DEBUG LWIP_DBG_ON
-#define TCP_CWND_DEBUG LWIP_DBG_ON
-#define TCP_WND_DEBUG LWIP_DBG_ON
-#define TCP_RST_DEBUG LWIP_DBG_ON
-#define TCP_QLEN_DEBUG LWIP_DBG_ON
+#define CHECKSUM_CHECK_IP CONFIG_LWIP_RXCHECKSUM
+#define CHECKSUM_CHECK_UDP CONFIG_LWIP_RXCHECKSUM
+#define CHECKSUM_CHECK_TCP CONFIG_LWIP_RXCHECKSUM
+#define CHECKSUM_CHECK_ICMP CONFIG_LWIP_RXCHECKSUM
+#define CHECKSUM_CHECK_ICMP6 CONFIG_LWIP_RXCHECKSUM
+#define CHECKSUM_CHECK_TCP CONFIG_LWIP_RXCHECKSUM
+
+#ifdef CONFIG_LWIP_MAINLOOP_DEBUG
+#define IP_DEBUG         LWIP_DBG_ON
+#define TCPIP_DEBUG      LWIP_DBG_ON
+#define TIMERS_DEBUG     LWIP_DBG_ON
+#endif /* CONFIG_LWIP_MAINLOOP_DEBUG */
+
+#ifdef CONFIG_LWIP_IF_DEBUG
+#define NETIF_DEBUG      LWIP_DBG_ON
+#endif /* CONFIG_LWIP_IF_DEBUG */
+
+#ifdef CONFIG_LWIP_IP_DEBUG
+#define IP_DEBUG         LWIP_DBG_ON
+#define IP6_DEBUG        LWIP_DBG_ON
+#define IP_REASS_DEBUG   LWIP_DBG_ON
+#endif /* CONFIG_LWIP_IP_DEBUG */
+
+#ifdef CONFIG_LWIP_UDP_DEBUG
+#define UDP_DEBUG        LWIP_DBG_ON
+#endif /* CONFIG_LWIP_UDP_DEBUG */
+
+#ifdef CONFIG_LWIP_TCP_DEBUG
+#define TCP_DEBUG        LWIP_DBG_ON
+#define TCP_FR_DEBUG     LWIP_DBG_ON
+#define TCP_RTO_DEBUG    LWIP_DBG_ON
+#define TCP_CWND_DEBUG   LWIP_DBG_ON
+#define TCP_WND_DEBUG    LWIP_DBG_ON
+#define TCP_RST_DEBUG    LWIP_DBG_ON
+#define TCP_QLEN_DEBUG   LWIP_DBG_ON
 //#define TCP_OUTPUT_DEBUG LWIP_DBG_ON
 //#define TCP_INPUT_DEBUG LWIP_DBG_ON
 #if LWIP_CHECKSUM_ON_COPY
 #define TCP_CHECKSUM_ON_COPY_SANITY_CHECK 1
 #endif
-#endif /* LWIP_TCP_DEBUG */
+#endif /* CONFIG_LWIP_TCP_DEBUG */
 
-#ifdef LWIP_SYS_DEBUG
-#define SYS_DEBUG LWIP_DBG_ON
-#define PBUF_DEBUG LWIP_DBG_ON
-#define MEM_DEBUG LWIP_DBG_ON
-#define MEMP_DEBUG LWIP_DBG_ON
+#ifdef CONFIG_LWIP_SYS_DEBUG
+#define SYS_DEBUG        LWIP_DBG_ON
+#define PBUF_DEBUG       LWIP_DBG_ON
+#define MEM_DEBUG        LWIP_DBG_ON
+#define MEMP_DEBUG       LWIP_DBG_ON
 #endif /* LWIP_SYS_DEBUG */
 
 #ifdef LWIP_API_DEBUG
-#define SOCKETS_DEBUG LWIP_DBG_ON
-#define RAW_DEBUG LWIP_DBG_ON
-#define API_MSG_DEBUG LWIP_DBG_ON
-#define API_LIB_DEBUG LWIP_DBG_ON
+#define SOCKETS_DEBUG    LWIP_DBG_ON
+#define RAW_DEBUG        LWIP_DBG_ON
+#define API_MSG_DEBUG    LWIP_DBG_ON
+#define API_LIB_DEBUG    LWIP_DBG_ON
 #endif /* LWIP_API_DEBUG */
 
 #ifdef LWIP_SERVICE_DEBUG
-#define ETHARP_DEBUG LWIP_DBG_ON
-#define DNS_DEBUG LWIP_DBG_ON
-#define AUTOIP_DEBUG LWIP_DBG_ON
-#define DHCP_DEBUG LWIP_DBG_ON
-#define ICMP_DEBUG LWIP_DBG_ON
-#define SNMP_DEBUG LWIP_DBG_ON
-#define SNMP_MSG_DEBUG LWIP_DBG_ON
-#define SNMP_MIB_DEBUG LWIP_DBG_ON
-#define PPP_DEBUG LWIP_DBG_ON
-#define SLIP_DEBUG LWIP_DBG_ON
+#define ETHARP_DEBUG     LWIP_DBG_ON
+#define DNS_DEBUG        LWIP_DBG_ON
+#define AUTOIP_DEBUG     LWIP_DBG_ON
+#define DHCP_DEBUG       LWIP_DBG_ON
+#define ICMP_DEBUG       LWIP_DBG_ON
+#define SNMP_DEBUG       LWIP_DBG_ON
+#define SNMP_MSG_DEBUG   LWIP_DBG_ON
+#define SNMP_MIB_DEBUG   LWIP_DBG_ON
+#define PPP_DEBUG        LWIP_DBG_ON
+#define SLIP_DEBUG       LWIP_DBG_ON
 #endif /* LWIP_SERVICE_DEBUG */
 
 #endif /* __LWIP_LWIPOPTS_H__ */

diff --git a/init.c b/init.c
index 603e054e529c0fb9daeeb493aafb4de5c9aef046..0326662b805082962e03a7f68fc5f9884a7b5573 100644 (file)
--- a/init.c
+++ b/init.c
@@ -18,10 +18,10 @@ void sys_init(void)
  */
 int liblwip_init(void)
 {
-#if LIBUKSCHED
+#if CONFIG_LIBUKSCHED
         tcpip_init(NULL, NULL);
 #else
         lwip_init();
-#endif /* LIBUKSCHED */
+#endif /* CONFIG_LIBUKSCHED */
        return 0;
 }