Fixed bug #39224 Unused IPv6 address state defines in nd6

This commit is contained in:
Simon Goldschmidt 2014-02-25 22:26:02 +01:00
parent 01ecd3517e
commit 7b63878926
2 changed files with 1 additions and 8 deletions

View File

@ -723,7 +723,7 @@ nd6_tmr(void)
/* Try to get an address on this netif that is invalid. /* Try to get an address on this netif that is invalid.
* Skip 0 index (link-local address) */ * Skip 0 index (link-local address) */
for (j = 1; j < LWIP_IPV6_NUM_ADDRESSES; j++) { for (j = 1; j < LWIP_IPV6_NUM_ADDRESSES; j++) {
if (netif_ip6_addr_state(prefix_list[i].netif, j) == IP6_ADDRESS_STATE_INVALID) { if (netif_ip6_addr_state(prefix_list[i].netif, j) == IP6_ADDR_INVALID) {
/* Generate an address using this prefix and interface ID from link-local address. */ /* Generate an address using this prefix and interface ID from link-local address. */
prefix_list[i].netif->ip6_addr[j].addr[0] = prefix_list[i].prefix.addr[0]; prefix_list[i].netif->ip6_addr[j].addr[0] = prefix_list[i].prefix.addr[0];
prefix_list[i].netif->ip6_addr[j].addr[1] = prefix_list[i].prefix.addr[1]; prefix_list[i].netif->ip6_addr[j].addr[1] = prefix_list[i].prefix.addr[1];

View File

@ -328,13 +328,6 @@ PACK_STRUCT_END
# include "arch/epstruct.h" # include "arch/epstruct.h"
#endif #endif
/* the possible states of an IP address */
#define IP6_ADDRESS_STATE_INVALID (0)
#define IP6_ADDRESS_STATE_VALID (0x4)
#define IP6_ADDRESS_STATE_PREFERRED (0x5) /* includes valid */
#define IP6_ADDRESS_STATE_DEPRECATED (0x6) /* includes valid */
#define IP6_ADDRESS_STATE_TENTATIV (0x8)
/** 1 second period */ /** 1 second period */
#define ND6_TMR_INTERVAL 1000 #define ND6_TMR_INTERVAL 1000