diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-02-05 14:26:11 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-02-05 14:26:11 -0600 |
| commit | 9fd3c5194a59b7935ee3c13a933567b23ce9e1e9 (patch) | |
| tree | 0db0a1ed5090e595b95023cf98fdaf425155955b | |
| parent | a9e59ac77d5f54bd9b88c61484cea521d64c5bda (diff) | |
| download | nuttx-9fd3c5194a59b7935ee3c13a933567b23ce9e1e9.tar.gz nuttx-9fd3c5194a59b7935ee3c13a933567b23ce9e1e9.tar.bz2 nuttx-9fd3c5194a59b7935ee3c13a933567b23ce9e1e9.zip | |
Make some conditional compilation consistent
| -rw-r--r-- | nuttx/include/nuttx/net/ip.h | 2 | ||||
| -rw-r--r-- | nuttx/net/devif/devif_initialize.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nuttx/include/nuttx/net/ip.h b/nuttx/include/nuttx/net/ip.h index c7cc77906..fa2b57722 100644 --- a/nuttx/include/nuttx/net/ip.h +++ b/nuttx/include/nuttx/net/ip.h @@ -230,11 +230,11 @@ EXTERN const net_ipv6addr_t g_ipv6_allzeroaddr; /* An address of all zeroes */ #if defined(CONFIG_NET_ICMPv6_AUTOCONF) || defined(CONFIG_NET_ICMPv6_ROUTER) EXTERN const net_ipv6addr_t g_ipv6_allnodes; /* All link local nodes */ EXTERN const net_ipv6addr_t g_ipv6_allrouters; /* All link local routers */ -#endif #ifdef CONFIG_NET_ICMPv6_AUTOCONF EXTERN const net_ipv6addr_t g_ipv6_llnetmask; /* Netmask for local link address */ #endif #endif +#endif /**************************************************************************** * Public Function Prototypes diff --git a/nuttx/net/devif/devif_initialize.c b/nuttx/net/devif/devif_initialize.c index 9b477ee6b..1b7f7abd2 100644 --- a/nuttx/net/devif/devif_initialize.c +++ b/nuttx/net/devif/devif_initialize.c @@ -112,6 +112,7 @@ const net_ipv6addr_t g_ipv6_allrouters = /* All link local routers */ HTONS(0x0002) }; +#ifdef CONFIG_NET_ICMPv6_AUTOCONF /* Link-Local Address: Link-local addresses have "1111 1110 10" for the * first ten bits followed by 54 zeroes and then the 64 bit interface * identifier (typically derived from the data link layer address). @@ -121,6 +122,7 @@ const net_ipv6addr_t g_ipv6_llnetmask = /* Netmask for local link address */ { 0xffff, 0xffff, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000 }; +#endif /* CONFIG_NET_ICMPv6_AUTOCONF */ #ifdef CONFIG_NET_ETHERNET |