From ac4c80208914da6fc9d46745828ccc0f62f339f6 Mon Sep 17 00:00:00 2001 From: Ivan Delamer Date: Thu, 22 Mar 2012 10:25:50 -0600 Subject: [PATCH] Disable leftover ND6 queueing code when !LWIP_ND6_QUEUING. --- src/core/ipv6/ethip6.c | 6 ++++-- src/core/ipv6/nd6.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/ipv6/ethip6.c b/src/core/ipv6/ethip6.c index 99410103..ecb9972d 100644 --- a/src/core/ipv6/ethip6.c +++ b/src/core/ipv6/ethip6.c @@ -185,11 +185,13 @@ ethip6_output(struct netif *netif, struct pbuf *q, ip6_addr_t *ip6addr) return ethip6_send(netif, q, (struct eth_addr*)(netif->hwaddr), &dest); } +#if LWIP_ND6_QUEUEING /* We should queue packet on this interface. */ pbuf_header(q, -(s16_t)SIZEOF_ETH_HDR); - nd6_queue_packet(i, q); - + return nd6_queue_packet(i, q); +#else /* LWIP_ND6_QUEUEING */ return ERR_OK; +#endif /* LWIP_ND6_QUEUEING */ } #endif /* LWIP_IPV6 && LWIP_ETHERNET */ diff --git a/src/core/ipv6/nd6.c b/src/core/ipv6/nd6.c index 9465db00..2694194a 100644 --- a/src/core/ipv6/nd6.c +++ b/src/core/ipv6/nd6.c @@ -1337,7 +1337,9 @@ nd6_new_router(ip6_addr_t * router_addr, struct netif * netif) } ip6_addr_set(&(neighbor_cache[neighbor_index].next_hop_address), router_addr); neighbor_cache[neighbor_index].netif = netif; +#if LWIP_ND6_QUEUEING neighbor_cache[neighbor_index].q = NULL; +#endif /* LWIP_ND6_QUEUEING */ neighbor_cache[neighbor_index].state = ND6_INCOMPLETE; neighbor_cache[neighbor_index].counter.probes_sent = 0; }