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

gnrc/rpl: Move GNRC_RPL_LIFETIME_UNIT to 'CONFIG_' namespace

Browse Source
This commit is contained in:
Leandro Lanzieri 2020-04-23 10:24:02 +02:00
parent 3b06b41fa9
commit 51939c3608
No known key found for this signature in database
GPG Key ID: 13559905E2EBEAA5
3 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

@ -292,8 +292,8 @@ static inline bool GNRC_RPL_COUNTER_GREATER_THAN(uint8_t A, uint8_t B)
#ifndef CONFIG_GNRC_RPL_DEFAULT_LIFETIME #ifndef CONFIG_GNRC_RPL_DEFAULT_LIFETIME
#define CONFIG_GNRC_RPL_DEFAULT_LIFETIME (5) #define CONFIG_GNRC_RPL_DEFAULT_LIFETIME (5)
#endif #endif
#ifndef GNRC_RPL_LIFETIME_UNIT #ifndef CONFIG_GNRC_RPL_LIFETIME_UNIT
#define GNRC_RPL_LIFETIME_UNIT (60) #define CONFIG_GNRC_RPL_LIFETIME_UNIT (60)
#endif #endif
/** @} */ /** @} */

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

@ -126,7 +126,7 @@ gnrc_rpl_instance_t *gnrc_rpl_root_init(uint8_t instance_id, ipv6_addr_t *dodag_
dodag->dio_min = CONFIG_GNRC_RPL_DEFAULT_DIO_INTERVAL_MIN; dodag->dio_min = CONFIG_GNRC_RPL_DEFAULT_DIO_INTERVAL_MIN;
dodag->dio_redun = CONFIG_GNRC_RPL_DEFAULT_DIO_REDUNDANCY_CONSTANT; dodag->dio_redun = CONFIG_GNRC_RPL_DEFAULT_DIO_REDUNDANCY_CONSTANT;
dodag->default_lifetime = CONFIG_GNRC_RPL_DEFAULT_LIFETIME; dodag->default_lifetime = CONFIG_GNRC_RPL_DEFAULT_LIFETIME;
dodag->lifetime_unit = GNRC_RPL_LIFETIME_UNIT; dodag->lifetime_unit = CONFIG_GNRC_RPL_LIFETIME_UNIT;
dodag->version = GNRC_RPL_COUNTER_INIT; dodag->version = GNRC_RPL_COUNTER_INIT;
dodag->grounded = GNRC_RPL_GROUNDED; dodag->grounded = GNRC_RPL_GROUNDED;
dodag->node_status = GNRC_RPL_ROOT_NODE; dodag->node_status = GNRC_RPL_ROOT_NODE;

2
sys/net/gnrc/routing/rpl/gnrc_rpl_dodag.c
View File

@ -149,7 +149,7 @@ bool gnrc_rpl_dodag_init(gnrc_rpl_instance_t *instance, ipv6_addr_t *dodag_id, k
dodag->dio_min = CONFIG_GNRC_RPL_DEFAULT_DIO_INTERVAL_MIN; dodag->dio_min = CONFIG_GNRC_RPL_DEFAULT_DIO_INTERVAL_MIN;
dodag->dio_redun = CONFIG_GNRC_RPL_DEFAULT_DIO_REDUNDANCY_CONSTANT; dodag->dio_redun = CONFIG_GNRC_RPL_DEFAULT_DIO_REDUNDANCY_CONSTANT;
dodag->default_lifetime = CONFIG_GNRC_RPL_DEFAULT_LIFETIME; dodag->default_lifetime = CONFIG_GNRC_RPL_DEFAULT_LIFETIME;
dodag->lifetime_unit = GNRC_RPL_LIFETIME_UNIT; dodag->lifetime_unit = CONFIG_GNRC_RPL_LIFETIME_UNIT;
dodag->node_status = GNRC_RPL_NORMAL_NODE; dodag->node_status = GNRC_RPL_NORMAL_NODE;
dodag->dao_seq = GNRC_RPL_COUNTER_INIT; dodag->dao_seq = GNRC_RPL_COUNTER_INIT;
dodag->dtsn = 0; dodag->dtsn = 0;