From 22b4df953758fb4ccb22eee51cfec82b2a511a8d Mon Sep 17 00:00:00 2001
From: Leandro Lanzieri <leandro.lanzieri@haw-hamburg.de>
Date: Thu, 12 Mar 2020 16:14:26 +0100
Subject: [PATCH] gnrc/nib: Move GNRC_IPV6_NIB_CONF_MULTIHOP_DAD to 'CONFIG_'
 namespace

Also evaluate using IS_ACTIVE macro.
---
 sys/include/net/gnrc/ipv6/nib/conf.h            | 4 ++--
 sys/net/gnrc/network_layer/ipv6/nib/_nib-6lr.c  | 8 ++++----
 sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.c | 4 ++--
 sys/net/gnrc/network_layer/ipv6/nib/nib.c       | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/include/net/gnrc/ipv6/nib/conf.h b/sys/include/net/gnrc/ipv6/nib/conf.h
index 31b0755938..95b9bdb046 100644
--- a/sys/include/net/gnrc/ipv6/nib/conf.h
+++ b/sys/include/net/gnrc/ipv6/nib/conf.h
@@ -208,8 +208,8 @@ extern "C" {
  *
  * @see [RFC 6775, section 8.2](https://tools.ietf.org/html/rfc6775#section-8.2)
  */
-#ifndef GNRC_IPV6_NIB_CONF_MULTIHOP_DAD
-#define GNRC_IPV6_NIB_CONF_MULTIHOP_DAD 0
+#ifndef CONFIG_GNRC_IPV6_NIB_MULTIHOP_DAD
+#define CONFIG_GNRC_IPV6_NIB_MULTIHOP_DAD  0
 #endif
 /** @} */
 
diff --git a/sys/net/gnrc/network_layer/ipv6/nib/_nib-6lr.c b/sys/net/gnrc/network_layer/ipv6/nib/_nib-6lr.c
index cdae02add1..c892fde2f4 100644
--- a/sys/net/gnrc/network_layer/ipv6/nib/_nib-6lr.c
+++ b/sys/net/gnrc/network_layer/ipv6/nib/_nib-6lr.c
@@ -62,9 +62,9 @@ uint8_t _reg_addr_upstream(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6,
               aro->eui64.uint8[6], aro->eui64.uint8[7]);
         if ((nce == NULL) || !(nce->mode & _NC) ||
             (memcmp(&nce->eui64, &aro->eui64, sizeof(aro->eui64)) == 0)) {
-#if GNRC_IPV6_NIB_CONF_MULTIHOP_DAD
+#if IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_MULTIHOP_DAD)
             /* TODO */
-#endif  /* GNRC_IPV6_NIB_CONF_MULTIHOP_DAD */
+#endif  /* CONFIG_GNRC_IPV6_NIB_MULTIHOP_DAD */
             if (aro->ltime.u16 != 0) {
                 _handle_sl2ao(netif, ipv6, icmpv6, sl2ao);
                 /* re-get NCE in case it was updated */
@@ -112,12 +112,12 @@ gnrc_pktsnip_t *_copy_and_handle_aro(gnrc_netif_t *netif,
                 DEBUG("nib: No space left in packet buffer. Not replying NS");
             }
         }
-#if GNRC_IPV6_NIB_CONF_MULTIHOP_DAD
+#if IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_MULTIHOP_DAD)
         else if (status != _ADDR_REG_STATUS_IGNORE) {
             DEBUG("nib: Address was marked TENTATIVE => not replying NS, "
                   "waiting for DAC\n");
         }
-#endif  /* GNRC_IPV6_NIB_CONF_MULTIHOP_DAD */
+#endif  /* CONFIG_GNRC_IPV6_NIB_MULTIHOP_DAD */
     }
     return reply_aro;
 }
diff --git a/sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.c b/sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.c
index e75fdcac5d..18770ac5fd 100644
--- a/sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.c
+++ b/sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.c
@@ -121,7 +121,7 @@ void _handle_sl2ao(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6,
             if (icmpv6->type == ICMPV6_NBR_SOL) {
                 nce->info &= ~GNRC_IPV6_NIB_NC_INFO_IS_ROUTER;
             }
-#if GNRC_IPV6_NIB_CONF_MULTIHOP_DAD && IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_6LR)
+#if IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_MULTIHOP_DAD) && IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_6LR)
             else if (_rtr_sol_on_6lr(netif, icmpv6)) {
                 DEBUG("nib: Setting newly created entry to tentative\n");
                 _set_ar_state(nce, GNRC_IPV6_NIB_NC_INFO_AR_STATE_TENTATIVE);
@@ -129,7 +129,7 @@ void _handle_sl2ao(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6,
                              &nce->addr_reg_timeout,
                              SIXLOWPAN_ND_TENTATIVE_NCE_SEC_LTIME * MS_PER_SEC);
             }
-#endif  /* GNRC_IPV6_NIB_CONF_MULTIHOP_DAD && CONFIG_GNRC_IPV6_NIB_6LR */
+#endif  /* CONFIG_GNRC_IPV6_NIB_MULTIHOP_DAD && CONFIG_GNRC_IPV6_NIB_6LR */
         }
 #if ENABLE_DEBUG
         else {
diff --git a/sys/net/gnrc/network_layer/ipv6/nib/nib.c b/sys/net/gnrc/network_layer/ipv6/nib/nib.c
index c07f7cdb19..c6de0cc2f3 100644
--- a/sys/net/gnrc/network_layer/ipv6/nib/nib.c
+++ b/sys/net/gnrc/network_layer/ipv6/nib/nib.c
@@ -312,14 +312,14 @@ void gnrc_ipv6_nib_handle_pkt(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6,
             /* TODO */
             break;
 #endif  /* CONFIG_GNRC_IPV6_NIB_REDIRECT */
-#if GNRC_IPV6_NIB_CONF_MULTIHOP_DAD
+#if IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_MULTIHOP_DAD)
         case ICMPV6_DAR:
             /* TODO */
             break;
         case ICMPV6_DAC:
             /* TODO */
             break;
-#endif  /* GNRC_IPV6_NIB_CONF_MULTIHOP_DAD */
+#endif  /* CONFIG_GNRC_IPV6_NIB_MULTIHOP_DAD */
     }
     _nib_release();
     gnrc_netif_release(netif);