RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #4118 from cgundogan/pr/gnrc_ipv6/nc_unused_timer

Browse Source 
nc: remove unused rtr_sol_timer
This commit is contained in:
Martine Lenders 2015-10-20 20:53:00 +02:00
commit 390e6c0e9a
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/include/net/gnrc/ipv6/nc.h
View File

@ -146,9 +146,6 @@ typedef struct {
*/ */
vtimer_t nbr_adv_timer; vtimer_t nbr_adv_timer;
#ifdef MODULE_GNRC_SIXLOWPAN_ND
vtimer_t rtr_sol_timer; /**< Retransmission timer for unicast router solicitations */
#endif
#ifdef MODULE_GNRC_SIXLOWPAN_ND_ROUTER #ifdef MODULE_GNRC_SIXLOWPAN_ND_ROUTER
vtimer_t type_timeout; /**< Timer for type transissions */ vtimer_t type_timeout; /**< Timer for type transissions */
eui64_t eui64; /**< the unique EUI-64 of the neighbor (might be eui64_t eui64; /**< the unique EUI-64 of the neighbor (might be

3
sys/net/gnrc/network_layer/ipv6/nc/gnrc_ipv6_nc.c
View File

@ -146,9 +146,6 @@ void gnrc_ipv6_nc_remove(kernel_pid_t iface, const ipv6_addr_t *ipv6_addr)
gnrc_pktqueue_remove_head(&entry->pkts); gnrc_pktqueue_remove_head(&entry->pkts);
} }
#endif #endif
#ifdef MODULE_GNRC_SIXLOWPAN_ND
vtimer_remove(&entry->rtr_sol_timer);
#endif
#ifdef MODULE_GNRC_SIXLOWPAN_ND_ROUTER #ifdef MODULE_GNRC_SIXLOWPAN_ND_ROUTER
vtimer_remove(&entry->type_timeout); vtimer_remove(&entry->type_timeout);
#endif #endif

1
sys/net/gnrc/network_layer/sixlowpan/nd/gnrc_sixlowpan_nd.c
View File

@ -390,7 +390,6 @@ void gnrc_sixlowpan_nd_wakeup(void)
gnrc_ipv6_nc_t *router = gnrc_ipv6_nc_get_next_router(NULL); gnrc_ipv6_nc_t *router = gnrc_ipv6_nc_get_next_router(NULL);
while (router) { while (router) {
timex_t t = { 0, GNRC_NDP_RETRANS_TIMER }; timex_t t = { 0, GNRC_NDP_RETRANS_TIMER };
vtimer_remove(&router->rtr_sol_timer);
gnrc_sixlowpan_nd_uc_rtr_sol(router); gnrc_sixlowpan_nd_uc_rtr_sol(router);
gnrc_ndp_internal_send_nbr_sol(router->iface, NULL, &router->ipv6_addr, &router->ipv6_addr); gnrc_ndp_internal_send_nbr_sol(router->iface, NULL, &router->ipv6_addr, &router->ipv6_addr);
vtimer_remove(&router->nbr_sol_timer); vtimer_remove(&router->nbr_sol_timer);