diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-02-05 11:47:56 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-02-05 11:47:56 -0600 |
| commit | ccee7b8646185612a997d3b4cad85f424c79cfe7 (patch) | |
| tree | 8f0020c7b95f041b54959825cf2d71fab39a5ad3 /nuttx | |
| parent | 89cf65c01bda5c35d599323d2a97480c31d59764 (diff) | |
| download | px4-nuttx-ccee7b8646185612a997d3b4cad85f424c79cfe7.tar.gz px4-nuttx-ccee7b8646185612a997d3b4cad85f424c79cfe7.tar.bz2 px4-nuttx-ccee7b8646185612a997d3b4cad85f424c79cfe7.zip | |
Networking: Changes need to build ICMPv6 'router' configuration on STM32 with network debug enabled
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_eth.c | 8 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/ethernet.h | 2 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/ip.h | 4 | ||||
| -rw-r--r-- | nuttx/net/devif/devif_initialize.c | 6 |
4 files changed, 15 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_eth.c b/nuttx/arch/arm/src/stm32/stm32_eth.c index 4081485f3..aa163733f 100644 --- a/nuttx/arch/arm/src/stm32/stm32_eth.c +++ b/nuttx/arch/arm/src/stm32/stm32_eth.c @@ -2129,9 +2129,17 @@ static int stm32_ifup(struct net_driver_s *dev) FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)dev->d_private; int ret; +#ifdef CONFIG_NET_IPv4 ndbg("Bringing up: %d.%d.%d.%d\n", dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff, (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24); +#endif +#ifdef CONFIG_NET_IPv4 + ndbg("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", + dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2], + dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5], + dev->d_ipv6addr[6], dev->d_ipv6addr[7]); +#endif /* Configure the Ethernet interface for DMA operation. */ diff --git a/nuttx/include/nuttx/net/ethernet.h b/nuttx/include/nuttx/net/ethernet.h index 4afe1c0ef..2fc93341b 100644 --- a/nuttx/include/nuttx/net/ethernet.h +++ b/nuttx/include/nuttx/net/ethernet.h @@ -93,7 +93,7 @@ extern "C" #define EXTERN extern #endif -#ifdef CONFIG_NET_ICMPv6_AUTOCONF +#if defined(CONFIG_NET_ICMPv6_AUTOCONF) || defined(CONFIG_NET_ICMPv6_ROUTER) EXTERN const struct ether_addr g_ipv6_ethallnodes; /* All link local nodes */ EXTERN const struct ether_addr g_ipv6_ethallrouters; /* All link local routers */ #endif diff --git a/nuttx/include/nuttx/net/ip.h b/nuttx/include/nuttx/net/ip.h index c46c7f00a..c7cc77906 100644 --- a/nuttx/include/nuttx/net/ip.h +++ b/nuttx/include/nuttx/net/ip.h @@ -227,9 +227,11 @@ EXTERN const in_addr_t g_ipv4_allzeroaddr; /* An address of all zeroes */ #ifdef CONFIG_NET_IPv6 EXTERN const net_ipv6addr_t g_ipv6_alloneaddr; /* An address of all ones */ EXTERN const net_ipv6addr_t g_ipv6_allzeroaddr; /* An address of all zeroes */ -#ifdef CONFIG_NET_ICMPv6_AUTOCONF +#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 diff --git a/nuttx/net/devif/devif_initialize.c b/nuttx/net/devif/devif_initialize.c index 65bef0821..9b477ee6b 100644 --- a/nuttx/net/devif/devif_initialize.c +++ b/nuttx/net/devif/devif_initialize.c @@ -95,8 +95,8 @@ const net_ipv6addr_t g_ipv6_allzeroaddr = /* An address of all zeroes */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; -#ifdef CONFIG_NET_ICMPv6_AUTOCONF - /* IPv6 Multi-cast IP address */ +#if defined(CONFIG_NET_ICMPv6_AUTOCONF) || defined(CONFIG_NET_ICMPv6_ROUTER) +/* IPv6 Multi-cast IP addresses */ const net_ipv6addr_t g_ipv6_allnodes = /* All link local nodes */ { @@ -142,7 +142,7 @@ const struct ether_addr g_ipv6_ethallrouters = /* All link local routers */ }; #endif /* CONFIG_NET_ETHERNET */ -#endif /* CONFIG_NET_ICMPv6_AUTOCONF */ +#endif /* CONFIG_NET_ICMPv6_AUTOCONF || CONFIG_NET_ICMPv6_ROUTER */ #endif /* CONFIG_NET_IPv4 */ /**************************************************************************** |