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

gnrc/rpl: Move GNRC_RPL_DAO_DELAY_JITTER to 'CONFIG_' namespace

Browse Source
This commit is contained in:
Leandro Lanzieri 2020-04-23 10:34:30 +02:00
parent 3deab70a4c
commit 33189b869e
No known key found for this signature in database
GPG Key ID: 13559905E2EBEAA5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/include/net/gnrc/rpl.h
View File

@ -344,11 +344,11 @@ static inline bool GNRC_RPL_COUNTER_GREATER_THAN(uint8_t A, uint8_t B)
*/ */
#define CONFIG_GNRC_RPL_DAO_DELAY_DEFAULT (1000UL) #define CONFIG_GNRC_RPL_DAO_DELAY_DEFAULT (1000UL)
#endif #endif
#ifndef GNRC_RPL_DAO_DELAY_JITTER #ifndef CONFIG_GNRC_RPL_DAO_DELAY_JITTER
/** /**
* @brief Jitter for DAOs in milli seconds * @brief Jitter for DAOs in milli seconds
*/ */
#define GNRC_RPL_DAO_DELAY_JITTER (1000UL) #define CONFIG_GNRC_RPL_DAO_DELAY_JITTER (1000UL)
#endif #endif
/** @} */ /** @} */

4
sys/net/gnrc/routing/rpl/gnrc_rpl.c
View File

@ -324,7 +324,7 @@ void gnrc_rpl_delay_dao(gnrc_rpl_dodag_t *dodag)
evtimer_del(&gnrc_rpl_evtimer, (evtimer_event_t *)&dodag->dao_event); evtimer_del(&gnrc_rpl_evtimer, (evtimer_event_t *)&dodag->dao_event);
((evtimer_event_t *)&(dodag->dao_event))->offset = random_uint32_range( ((evtimer_event_t *)&(dodag->dao_event))->offset = random_uint32_range(
CONFIG_GNRC_RPL_DAO_DELAY_DEFAULT, CONFIG_GNRC_RPL_DAO_DELAY_DEFAULT,
CONFIG_GNRC_RPL_DAO_DELAY_DEFAULT + GNRC_RPL_DAO_DELAY_JITTER CONFIG_GNRC_RPL_DAO_DELAY_DEFAULT + CONFIG_GNRC_RPL_DAO_DELAY_JITTER
); );
evtimer_add_msg(&gnrc_rpl_evtimer, &dodag->dao_event, gnrc_rpl_pid); evtimer_add_msg(&gnrc_rpl_evtimer, &dodag->dao_event, gnrc_rpl_pid);
dodag->dao_counter = 0; dodag->dao_counter = 0;
@ -336,7 +336,7 @@ void gnrc_rpl_long_delay_dao(gnrc_rpl_dodag_t *dodag)
evtimer_del(&gnrc_rpl_evtimer, (evtimer_event_t *)&dodag->dao_event); evtimer_del(&gnrc_rpl_evtimer, (evtimer_event_t *)&dodag->dao_event);
((evtimer_event_t *)&(dodag->dao_event))->offset = random_uint32_range( ((evtimer_event_t *)&(dodag->dao_event))->offset = random_uint32_range(
CONFIG_GNRC_RPL_DAO_DELAY_LONG, CONFIG_GNRC_RPL_DAO_DELAY_LONG,
CONFIG_GNRC_RPL_DAO_DELAY_LONG + GNRC_RPL_DAO_DELAY_JITTER CONFIG_GNRC_RPL_DAO_DELAY_LONG + CONFIG_GNRC_RPL_DAO_DELAY_JITTER
); );
evtimer_add_msg(&gnrc_rpl_evtimer, &dodag->dao_event, gnrc_rpl_pid); evtimer_add_msg(&gnrc_rpl_evtimer, &dodag->dao_event, gnrc_rpl_pid);
dodag->dao_counter = 0; dodag->dao_counter = 0;