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

gnrc/rpl: Move GNRC_RPL_DEFAULT_INSTANCE to 'CONFIG_' namespace

Browse Source
This commit is contained in:
Leandro Lanzieri 2020-04-24 13:15:23 +02:00
parent 5a28e7cad4
commit e547061d19
No known key found for this signature in database
GPG Key ID: 13559905E2EBEAA5
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,8 +205,8 @@ extern "C" {
/** /**
* @brief Default Instance ID * @brief Default Instance ID
*/ */
#ifndef GNRC_RPL_DEFAULT_INSTANCE #ifndef CONFIG_GNRC_RPL_DEFAULT_INSTANCE
#define GNRC_RPL_DEFAULT_INSTANCE (0) #define CONFIG_GNRC_RPL_DEFAULT_INSTANCE (0)
#endif #endif
/** /**

4
sys/net/gnrc/application_layer/dhcpv6/client.c
View File

@ -164,12 +164,12 @@ void dhcpv6_client_conf_prefix(unsigned iface, const ipv6_addr_t *pfx,
if (IS_USED(MODULE_GNRC_RPL)) { if (IS_USED(MODULE_GNRC_RPL)) {
gnrc_rpl_init(netif->pid); gnrc_rpl_init(netif->pid);
gnrc_rpl_instance_t *inst = gnrc_rpl_instance_get( gnrc_rpl_instance_t *inst = gnrc_rpl_instance_get(
GNRC_RPL_DEFAULT_INSTANCE CONFIG_GNRC_RPL_DEFAULT_INSTANCE
); );
if (inst) { if (inst) {
gnrc_rpl_instance_remove(inst); gnrc_rpl_instance_remove(inst);
} }
gnrc_rpl_root_init(GNRC_RPL_DEFAULT_INSTANCE, &addr, false, false); gnrc_rpl_root_init(CONFIG_GNRC_RPL_DEFAULT_INSTANCE, &addr, false, false);
} }
} }
} }

4
sys/net/gnrc/application_layer/uhcpc/gnrc_uhcpc.c
View File

@ -188,11 +188,11 @@ void uhcp_handle_prefix(uint8_t *prefix, uint8_t prefix_len, uint16_t lifetime,
#ifdef MODULE_GNRC_RPL #ifdef MODULE_GNRC_RPL
gnrc_rpl_init(gnrc_wireless_interface); gnrc_rpl_init(gnrc_wireless_interface);
gnrc_rpl_instance_t *inst = gnrc_rpl_instance_get( gnrc_rpl_instance_t *inst = gnrc_rpl_instance_get(
GNRC_RPL_DEFAULT_INSTANCE); CONFIG_GNRC_RPL_DEFAULT_INSTANCE);
if (inst) { if (inst) {
gnrc_rpl_instance_remove(inst); gnrc_rpl_instance_remove(inst);
} }
gnrc_rpl_root_init(GNRC_RPL_DEFAULT_INSTANCE, (ipv6_addr_t*)prefix, false, gnrc_rpl_root_init(CONFIG_GNRC_RPL_DEFAULT_INSTANCE, (ipv6_addr_t*)prefix, false,
false); false);
#endif #endif
LOG_INFO("gnrc_uhcpc: uhcp_handle_prefix(): configured new prefix %s/%u\n", LOG_INFO("gnrc_uhcpc: uhcp_handle_prefix(): configured new prefix %s/%u\n",

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

@ -371,7 +371,7 @@ void _dao_handle_send(gnrc_rpl_dodag_t *dodag)
uint8_t gnrc_rpl_gen_instance_id(bool local) uint8_t gnrc_rpl_gen_instance_id(bool local)
{ {
mutex_lock(&_inst_id_mutex); mutex_lock(&_inst_id_mutex);
uint8_t instance_id = GNRC_RPL_DEFAULT_INSTANCE; uint8_t instance_id = CONFIG_GNRC_RPL_DEFAULT_INSTANCE;
if (local) { if (local) {
instance_id = ((_instance_id++) | GNRC_RPL_INSTANCE_ID_MSB); instance_id = ((_instance_id++) | GNRC_RPL_INSTANCE_ID_MSB);