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

gnrc/nib: Move GNRC_IPV6_NIB_CONF_NO_RTR_SOL to 'CONFIG_' namespace

Browse Source 
Also evaluate using IS_ACTIVE macro.
This commit is contained in:
Leandro Lanzieri 2020-03-12 17:12:07 +01:00
parent 53a522d642
commit 1f20ffc150
No known key found for this signature in database
GPG Key ID: 39607DE6080007A3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/include/net/gnrc/ipv6/nib/conf.h
View File

@ -227,8 +227,8 @@ extern "C" {
* *
* @warning Only do this if you know what you're doing * @warning Only do this if you know what you're doing
*/ */
#ifndef GNRC_IPV6_NIB_CONF_NO_RTR_SOL #ifndef CONFIG_GNRC_IPV6_NIB_NO_RTR_SOL
#define GNRC_IPV6_NIB_CONF_NO_RTR_SOL 0 #define CONFIG_GNRC_IPV6_NIB_NO_RTR_SOL 0
#endif #endif
/** /**

4
sys/net/gnrc/network_layer/ipv6/nib/nib.c
View File

@ -1318,7 +1318,7 @@ static void _handle_rtr_timeout(_nib_dr_entry_t *router)
void _handle_search_rtr(gnrc_netif_t *netif) void _handle_search_rtr(gnrc_netif_t *netif)
{ {
#if !GNRC_IPV6_NIB_CONF_NO_RTR_SOL #if !IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_NO_RTR_SOL)
gnrc_netif_acquire(netif); gnrc_netif_acquire(netif);
if (!(gnrc_netif_is_rtr_adv(netif)) || gnrc_netif_is_6ln(netif)) { if (!(gnrc_netif_is_rtr_adv(netif)) || gnrc_netif_is_6ln(netif)) {
uint32_t next_rs = _evtimer_lookup(netif, GNRC_IPV6_NIB_SEARCH_RTR); uint32_t next_rs = _evtimer_lookup(netif, GNRC_IPV6_NIB_SEARCH_RTR);
@ -1343,7 +1343,7 @@ void _handle_search_rtr(gnrc_netif_t *netif)
gnrc_netif_release(netif); gnrc_netif_release(netif);
#else #else
(void)netif; (void)netif;
#endif /* !GNRC_IPV6_NIB_CONF_NO_RTR_SOL */ #endif /* !CONFIG_GNRC_IPV6_NIB_NO_RTR_SOL */
} }
#if IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_DNS) #if IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_DNS)

2
tests/gnrc_netif/Makefile
View File

@ -14,7 +14,7 @@ USEMODULE += od
# deactivate automatically emitted packets from IPv6 neighbor discovery # deactivate automatically emitted packets from IPv6 neighbor discovery
CFLAGS += -DCONFIG_GNRC_IPV6_NIB_ARSM=0 CFLAGS += -DCONFIG_GNRC_IPV6_NIB_ARSM=0
CFLAGS += -DCONFIG_GNRC_IPV6_NIB_SLAAC=0 CFLAGS += -DCONFIG_GNRC_IPV6_NIB_SLAAC=0
CFLAGS += -DGNRC_IPV6_NIB_CONF_NO_RTR_SOL=1 CFLAGS += -DCONFIG_GNRC_IPV6_NIB_NO_RTR_SOL=1
CFLAGS += -DGNRC_NETIF_ADDRS_NUMOF=16 CFLAGS += -DGNRC_NETIF_ADDRS_NUMOF=16
CFLAGS += -DGNRC_NETIF_GROUPS_NUMOF=8 CFLAGS += -DGNRC_NETIF_GROUPS_NUMOF=8
CFLAGS += -DLOG_LEVEL=LOG_NONE CFLAGS += -DLOG_LEVEL=LOG_NONE