From 8722699fb296cc8f91a709848cdb28e4fcaaf98d Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Tue, 27 Oct 2015 17:56:39 +0100 Subject: [PATCH] gnrc_ndp: stop multicast RS retransmissions on RA reception 6LoWPAN interfaces already do that, other interface happily continue multicasting RSs even if a router was found. --- sys/net/gnrc/network_layer/ndp/gnrc_ndp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c b/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c index dab4141b82..24e0a8ee53 100644 --- a/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c +++ b/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c @@ -609,10 +609,10 @@ void gnrc_ndp_rtr_adv_handle(kernel_pid_t iface, gnrc_pktsnip_t *pkt, ipv6_hdr_t } #endif _stale_nc(iface, &ipv6->src, l2src, l2src_len); + /* stop multicast router solicitation retransmission timer */ + xtimer_remove(&if_entry->rtr_sol_timer); #ifdef MODULE_GNRC_SIXLOWPAN_ND if (if_entry->flags & GNRC_IPV6_NETIF_FLAGS_SIXLOWPAN) { - /* stop multicast router solicitation retransmission timer */ - xtimer_remove(&if_entry->rtr_sol_timer); /* 3/4 of the time should be "well before" enough the respective timeout * not to run out; see https://tools.ietf.org/html/rfc6775#section-5.4.3 */ next_rtr_sol *= 3;