From e74ba8f92d9f698a60112371490a93dcf1a471fb Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Thu, 17 Jun 2021 18:37:26 +0200 Subject: [PATCH] gnrc/nib: don't define _set_rtr_adv() twice It's already defined in `_nib-router.h`, defining it to no-op in `_nib-6lr.h` makes it impossible to run-time enable advertisements on non 6lo nodes. --- sys/net/gnrc/network_layer/ipv6/nib/_nib-6lr.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/net/gnrc/network_layer/ipv6/nib/_nib-6lr.h b/sys/net/gnrc/network_layer/ipv6/nib/_nib-6lr.h index 60054a703b..44dd896bae 100644 --- a/sys/net/gnrc/network_layer/ipv6/nib/_nib-6lr.h +++ b/sys/net/gnrc/network_layer/ipv6/nib/_nib-6lr.h @@ -118,12 +118,6 @@ gnrc_pktsnip_t *_copy_and_handle_aro(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6 const sixlowpan_nd_opt_ar_t *aro, const ndp_opt_t *sl2ao); -/** - * @brief Sets the @ref GNRC_NETIF_FLAGS_IPV6_RTR_ADV flags of an interface - * - * @param[in] netif The interface. - */ -void _set_rtr_adv(gnrc_netif_t *netif); #else /* CONFIG_GNRC_IPV6_NIB_6LR || defined(DOXYGEN) */ #define _rtr_sol_on_6lr(netif, icmpv6) (false) #define _get_ar_state(nbr) (_ADDR_REG_STATUS_IGNORE) @@ -133,7 +127,6 @@ void _set_rtr_adv(gnrc_netif_t *netif); */ #define _copy_and_handle_aro(netif, ipv6, icmpv6, aro, sl2ao) \ (NULL) -#define _set_rtr_adv(netif) (void)netif #endif /* CONFIG_GNRC_IPV6_NIB_6LR || defined(DOXYGEN) */ #ifdef __cplusplus