From e547061d19e86f366474d2c02e9ddc9f61d9aa5a Mon Sep 17 00:00:00 2001
From: Leandro Lanzieri <leandro.lanzieri@haw-hamburg.de>
Date: Fri, 24 Apr 2020 13:15:23 +0200
Subject: [PATCH] gnrc/rpl: Move GNRC_RPL_DEFAULT_INSTANCE to 'CONFIG_'
 namespace

---
 sys/include/net/gnrc/rpl.h                        | 4 ++--
 sys/net/gnrc/application_layer/dhcpv6/client.c    | 4 ++--
 sys/net/gnrc/application_layer/uhcpc/gnrc_uhcpc.c | 4 ++--
 sys/net/gnrc/routing/rpl/gnrc_rpl.c               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/include/net/gnrc/rpl.h b/sys/include/net/gnrc/rpl.h
index 60a9c85671..7e382e3342 100644
--- a/sys/include/net/gnrc/rpl.h
+++ b/sys/include/net/gnrc/rpl.h
@@ -205,8 +205,8 @@ extern "C" {
 /**
  * @brief   Default Instance ID
  */
-#ifndef GNRC_RPL_DEFAULT_INSTANCE
-#define GNRC_RPL_DEFAULT_INSTANCE (0)
+#ifndef CONFIG_GNRC_RPL_DEFAULT_INSTANCE
+#define CONFIG_GNRC_RPL_DEFAULT_INSTANCE (0)
 #endif
 
 /**
diff --git a/sys/net/gnrc/application_layer/dhcpv6/client.c b/sys/net/gnrc/application_layer/dhcpv6/client.c
index 960960d3dc..3234ea744c 100644
--- a/sys/net/gnrc/application_layer/dhcpv6/client.c
+++ b/sys/net/gnrc/application_layer/dhcpv6/client.c
@@ -164,12 +164,12 @@ void dhcpv6_client_conf_prefix(unsigned iface, const ipv6_addr_t *pfx,
         if (IS_USED(MODULE_GNRC_RPL)) {
             gnrc_rpl_init(netif->pid);
             gnrc_rpl_instance_t *inst = gnrc_rpl_instance_get(
-                    GNRC_RPL_DEFAULT_INSTANCE
+                    CONFIG_GNRC_RPL_DEFAULT_INSTANCE
                 );
             if (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);
         }
     }
 }
diff --git a/sys/net/gnrc/application_layer/uhcpc/gnrc_uhcpc.c b/sys/net/gnrc/application_layer/uhcpc/gnrc_uhcpc.c
index 0672d7ac55..007a12ea1c 100644
--- a/sys/net/gnrc/application_layer/uhcpc/gnrc_uhcpc.c
+++ b/sys/net/gnrc/application_layer/uhcpc/gnrc_uhcpc.c
@@ -188,11 +188,11 @@ void uhcp_handle_prefix(uint8_t *prefix, uint8_t prefix_len, uint16_t lifetime,
 #ifdef MODULE_GNRC_RPL
     gnrc_rpl_init(gnrc_wireless_interface);
     gnrc_rpl_instance_t *inst = gnrc_rpl_instance_get(
-                                    GNRC_RPL_DEFAULT_INSTANCE);
+                                    CONFIG_GNRC_RPL_DEFAULT_INSTANCE);
     if (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);
 #endif
     LOG_INFO("gnrc_uhcpc: uhcp_handle_prefix(): configured new prefix %s/%u\n",
diff --git a/sys/net/gnrc/routing/rpl/gnrc_rpl.c b/sys/net/gnrc/routing/rpl/gnrc_rpl.c
index 16f2704a8e..46e346f1d9 100644
--- a/sys/net/gnrc/routing/rpl/gnrc_rpl.c
+++ b/sys/net/gnrc/routing/rpl/gnrc_rpl.c
@@ -371,7 +371,7 @@ void _dao_handle_send(gnrc_rpl_dodag_t *dodag)
 uint8_t gnrc_rpl_gen_instance_id(bool local)
 {
     mutex_lock(&_inst_id_mutex);
-    uint8_t instance_id = GNRC_RPL_DEFAULT_INSTANCE;
+    uint8_t instance_id = CONFIG_GNRC_RPL_DEFAULT_INSTANCE;
 
     if (local) {
         instance_id = ((_instance_id++) | GNRC_RPL_INSTANCE_ID_MSB);