From df29a769ba7426a0969bcfd139a14fa62e459d2c Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Thu, 23 Apr 2020 10:25:18 +0200 Subject: [PATCH] gnrc/rpl: Move GNRC_RPL_DAO_SEND_RETRIES to 'CONFIG_' namespace --- sys/include/net/gnrc/rpl.h | 4 ++-- sys/net/gnrc/routing/rpl/gnrc_rpl.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/include/net/gnrc/rpl.h b/sys/include/net/gnrc/rpl.h index 89df349285..d1515ee10d 100644 --- a/sys/include/net/gnrc/rpl.h +++ b/sys/include/net/gnrc/rpl.h @@ -326,8 +326,8 @@ static inline bool GNRC_RPL_COUNTER_GREATER_THAN(uint8_t A, uint8_t B) * @{ */ -#ifndef GNRC_RPL_DAO_SEND_RETRIES -#define GNRC_RPL_DAO_SEND_RETRIES (4) +#ifndef CONFIG_GNRC_RPL_DAO_SEND_RETRIES +#define CONFIG_GNRC_RPL_DAO_SEND_RETRIES (4) #endif #ifndef GNRC_RPL_DAO_ACK_DELAY #define GNRC_RPL_DAO_ACK_DELAY (3000UL) diff --git a/sys/net/gnrc/routing/rpl/gnrc_rpl.c b/sys/net/gnrc/routing/rpl/gnrc_rpl.c index bffe2b1be9..7514f8d059 100644 --- a/sys/net/gnrc/routing/rpl/gnrc_rpl.c +++ b/sys/net/gnrc/routing/rpl/gnrc_rpl.c @@ -353,7 +353,8 @@ void _dao_handle_send(gnrc_rpl_dodag_t *dodag) return; } #endif - if ((dodag->dao_ack_received == false) && (dodag->dao_counter < GNRC_RPL_DAO_SEND_RETRIES)) { + if ((dodag->dao_ack_received == false) && + (dodag->dao_counter < CONFIG_GNRC_RPL_DAO_SEND_RETRIES)) { dodag->dao_counter++; gnrc_rpl_send_DAO(dodag->instance, NULL, dodag->default_lifetime); evtimer_del(&gnrc_rpl_evtimer, (evtimer_event_t *)&dodag->dao_event);