Disable leftover ND6 queueing code when !LWIP_ND6_QUEUING.

This commit is contained in:
Ivan Delamer 2012-03-22 10:25:50 -06:00
parent c6e4b8f829
commit ac4c802089
2 changed files with 6 additions and 2 deletions

View File

@ -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 */

View File

@ -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;
}