From acd789bd87d984f14b8b8ad01881e9f9487d6989 Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Thu, 12 Mar 2020 17:19:08 +0100 Subject: [PATCH] gnrc/nib: Move GNRC_IPV6_NIB_CONF_REACH_TIME_RESET to 'CONFIG_' --- sys/include/net/gnrc/ipv6/nib/conf.h | 4 ++-- sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.c | 2 +- sys/net/gnrc/network_layer/ipv6/nib/nib.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/include/net/gnrc/ipv6/nib/conf.h b/sys/include/net/gnrc/ipv6/nib/conf.h index 7b9961a69b..8b8157396d 100644 --- a/sys/include/net/gnrc/ipv6/nib/conf.h +++ b/sys/include/net/gnrc/ipv6/nib/conf.h @@ -218,8 +218,8 @@ extern "C" { * * @see [RFC 4861, section 6.3.4](https://tools.ietf.org/html/rfc4861#section-6.3.4) */ -#ifndef GNRC_IPV6_NIB_CONF_REACH_TIME_RESET -#define GNRC_IPV6_NIB_CONF_REACH_TIME_RESET (7200000U) +#ifndef CONFIG_GNRC_IPV6_NIB_REACH_TIME_RESET +#define CONFIG_GNRC_IPV6_NIB_REACH_TIME_RESET (7200000U) #endif /** diff --git a/sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.c b/sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.c index 18770ac5fd..6e3686ed97 100644 --- a/sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.c +++ b/sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.c @@ -415,7 +415,7 @@ void _recalc_reach_time(gnrc_netif_ipv6_t *netif) netif->reach_time_base + half); _evtimer_add(netif, GNRC_IPV6_NIB_RECALC_REACH_TIME, &netif->recalc_reach_time, - GNRC_IPV6_NIB_CONF_REACH_TIME_RESET); + CONFIG_GNRC_IPV6_NIB_REACH_TIME_RESET); } void _set_reachable(gnrc_netif_t *netif, _nib_onl_entry_t *nce) diff --git a/sys/net/gnrc/network_layer/ipv6/nib/nib.c b/sys/net/gnrc/network_layer/ipv6/nib/nib.c index 674df44dfc..73cfd24f11 100644 --- a/sys/net/gnrc/network_layer/ipv6/nib/nib.c +++ b/sys/net/gnrc/network_layer/ipv6/nib/nib.c @@ -681,7 +681,7 @@ static void _handle_rtr_adv(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6, if (reach_time != netif->ipv6.reach_time_base) { _evtimer_add(netif, GNRC_IPV6_NIB_RECALC_REACH_TIME, &netif->ipv6.recalc_reach_time, - GNRC_IPV6_NIB_CONF_REACH_TIME_RESET); + CONFIG_GNRC_IPV6_NIB_REACH_TIME_RESET); netif->ipv6.reach_time_base = reach_time; _recalc_reach_time(&netif->ipv6); }