riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gnrc/nib: don't define _set_rtr_adv() twice

Browse Source 
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.
This commit is contained in:
Benjamin Valentin 2021-06-17 18:37:26 +02:00 committed by Benjamin Valentin
parent 1011af27a1
commit e74ba8f92d
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/net/gnrc/network_layer/ipv6/nib/_nib-6lr.h
View File

@ -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 sixlowpan_nd_opt_ar_t *aro,
const ndp_opt_t *sl2ao); 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) */ #else /* CONFIG_GNRC_IPV6_NIB_6LR || defined(DOXYGEN) */
#define _rtr_sol_on_6lr(netif, icmpv6) (false) #define _rtr_sol_on_6lr(netif, icmpv6) (false)
#define _get_ar_state(nbr) (_ADDR_REG_STATUS_IGNORE) #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) \ #define _copy_and_handle_aro(netif, ipv6, icmpv6, aro, sl2ao) \
(NULL) (NULL)
#define _set_rtr_adv(netif) (void)netif
#endif /* CONFIG_GNRC_IPV6_NIB_6LR || defined(DOXYGEN) */ #endif /* CONFIG_GNRC_IPV6_NIB_6LR || defined(DOXYGEN) */
#ifdef __cplusplus #ifdef __cplusplus