From beb3321132872148fc977292362aff5070183efd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= Date: Tue, 20 Oct 2015 19:05:42 +0200 Subject: [PATCH] nc: remove unused rtr_sol_timer --- sys/include/net/gnrc/ipv6/nc.h | 3 --- sys/net/gnrc/network_layer/ipv6/nc/gnrc_ipv6_nc.c | 3 --- sys/net/gnrc/network_layer/sixlowpan/nd/gnrc_sixlowpan_nd.c | 1 - 3 files changed, 7 deletions(-) diff --git a/sys/include/net/gnrc/ipv6/nc.h b/sys/include/net/gnrc/ipv6/nc.h index 83efea2aa5..2fe08b0295 100644 --- a/sys/include/net/gnrc/ipv6/nc.h +++ b/sys/include/net/gnrc/ipv6/nc.h @@ -146,9 +146,6 @@ typedef struct { */ 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 vtimer_t type_timeout; /**< Timer for type transissions */ eui64_t eui64; /**< the unique EUI-64 of the neighbor (might be diff --git a/sys/net/gnrc/network_layer/ipv6/nc/gnrc_ipv6_nc.c b/sys/net/gnrc/network_layer/ipv6/nc/gnrc_ipv6_nc.c index b33078f219..1bee007629 100644 --- a/sys/net/gnrc/network_layer/ipv6/nc/gnrc_ipv6_nc.c +++ b/sys/net/gnrc/network_layer/ipv6/nc/gnrc_ipv6_nc.c @@ -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); } #endif -#ifdef MODULE_GNRC_SIXLOWPAN_ND - vtimer_remove(&entry->rtr_sol_timer); -#endif #ifdef MODULE_GNRC_SIXLOWPAN_ND_ROUTER vtimer_remove(&entry->type_timeout); #endif diff --git a/sys/net/gnrc/network_layer/sixlowpan/nd/gnrc_sixlowpan_nd.c b/sys/net/gnrc/network_layer/sixlowpan/nd/gnrc_sixlowpan_nd.c index 8993e96c3e..9e2d562285 100644 --- a/sys/net/gnrc/network_layer/sixlowpan/nd/gnrc_sixlowpan_nd.c +++ b/sys/net/gnrc/network_layer/sixlowpan/nd/gnrc_sixlowpan_nd.c @@ -390,7 +390,6 @@ void gnrc_sixlowpan_nd_wakeup(void) gnrc_ipv6_nc_t *router = gnrc_ipv6_nc_get_next_router(NULL); while (router) { timex_t t = { 0, GNRC_NDP_RETRANS_TIMER }; - vtimer_remove(&router->rtr_sol_timer); gnrc_sixlowpan_nd_uc_rtr_sol(router); gnrc_ndp_internal_send_nbr_sol(router->iface, NULL, &router->ipv6_addr, &router->ipv6_addr); vtimer_remove(&router->nbr_sol_timer);