Merge branch 'gnrc_netif2_integration/master' into git/fix/7979-backport

Makefile.dep

@@ -36,9 +36,8 @@ ifneq (,$(filter sntp,$(USEMODULE)))
 endif
 
 ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
-  USEMODULE += gnrc_netif
-  USEMODULE += gnrc_netdev
   USEMODULE += netdev_default
+  USEMODULE += gnrc_netif
 endif
 
 ifneq (,$(filter netdev_ieee802154,$(USEMODULE)))
@@ -51,15 +50,17 @@ ifneq (,$(filter gnrc_uhcpc,$(USEMODULE)))
   USEMODULE += fmt
 endif
 
+ifneq (,$(filter uhcpc,$(USEMODULE)))
+  USEMODULE += posix
+endif
+
 ifneq (,$(filter nordic_softdevice_ble,$(USEPKG)))
   USEMODULE += softdevice_handler
   USEMODULE += ble_common
   USEMODULE += ble_6lowpan
   USEMODULE += gnrc_sixlowpan
   USEMODULE += gnrc_sixlowpan_iphc
   USEMODULE += gnrc_ipv6_default
-  USEMODULE += gnrc_netdev
-  USEMODULE += gnrc_ipv6_netif
 endif
 
 ifneq (,$(filter gnrc_%,$(filter-out gnrc_netapi gnrc_netreg gnrc_netif% gnrc_pkt%,$(USEMODULE))))
@@ -92,9 +93,6 @@ endif
 ifneq (,$(filter netdev_tap,$(USEMODULE)))
   USEMODULE += netif
   USEMODULE += netdev_eth
-  ifneq (,$(filter gnrc_%,$(USEMODULE)))
-    USEMODULE += gnrc_netdev
-  endif
 endif
 
 ifneq (,$(filter gnrc_tftp,$(USEMODULE)))
@@ -138,29 +136,30 @@ endif
 
 ifneq (,$(filter gnrc_sixlowpan_default,$(USEMODULE)))
   USEMODULE += gnrc_ipv6_default
+  USEMODULE += gnrc_ipv6_nib_6ln
   USEMODULE += gnrc_sixlowpan
-  USEMODULE += gnrc_sixlowpan_nd
   USEMODULE += gnrc_sixlowpan_frag
   USEMODULE += gnrc_sixlowpan_iphc
 endif
 
 ifneq (,$(filter gnrc_sixlowpan_router_default,$(USEMODULE)))
   USEMODULE += gnrc_ipv6_router_default
+  USEMODULE += gnrc_ipv6_nib_6lr
   USEMODULE += gnrc_sixlowpan_router
   USEMODULE += gnrc_sixlowpan_frag
   USEMODULE += gnrc_sixlowpan_iphc
 endif
 
 ifneq (,$(filter gnrc_sixlowpan_border_router_default,$(USEMODULE)))
+  USEMODULE += gnrc_ipv6_nib_6lbr
   USEMODULE += gnrc_ipv6_router_default
-  USEMODULE += gnrc_sixlowpan_nd_border_router
   USEMODULE += gnrc_sixlowpan_router
   USEMODULE += gnrc_sixlowpan_frag
   USEMODULE += gnrc_sixlowpan_iphc
 endif
 
 ifneq (,$(filter gnrc_sixlowpan_router,$(USEMODULE)))
-  USEMODULE += gnrc_sixlowpan_nd_router
+  USEMODULE += gnrc_ipv6_router
 endif
 
 ifneq (,$(filter gnrc_sixlowpan_frag,$(USEMODULE)))
@@ -176,7 +175,6 @@ endif
 
 ifneq (,$(filter gnrc_sixlowpan,$(USEMODULE)))
   USEMODULE += gnrc_ipv6
-  USEMODULE += gnrc_sixlowpan_netif
   USEMODULE += sixlowpan
 endif
 
@@ -185,80 +183,19 @@ ifneq (,$(filter gnrc_sixlowpan_ctx,$(USEMODULE)))
   USEMODULE += xtimer
 endif
 
-ifneq (,$(filter gnrc_sixlowpan_nd_border_router,$(USEMODULE)))
-  USEMODULE += gnrc_sixlowpan_nd_router
-endif
-
-ifneq (,$(filter gnrc_sixlowpan_nd_router,$(USEMODULE)))
-  USEMODULE += gnrc_sixlowpan_nd
-endif
-
-ifneq (,$(filter gnrc_sixlowpan_nd,$(USEMODULE)))
-  USEMODULE += gnrc_ndp
-  USEMODULE += gnrc_ndp_internal
-  USEMODULE += gnrc_sixlowpan_ctx
-  USEMODULE += random
-  USEMODULE += xtimer
-endif
-
 ifneq (,$(filter gnrc_ipv6_default,$(USEMODULE)))
   USEMODULE += gnrc_ipv6
   USEMODULE += gnrc_icmpv6
-  ifeq (1,$(GNRC_NETIF_NUMOF))
-    ifeq (,$(filter gnrc_sixlowpan_nd,$(USEMODULE)))
-      USEMODULE += gnrc_ndp_host
-    endif
-  else
-    USEMODULE += gnrc_ndp_host
-  endif
 endif
 
 ifneq (,$(filter gnrc_ipv6_router_default,$(USEMODULE)))
   USEMODULE += gnrc_ipv6_router
   USEMODULE += gnrc_icmpv6
-  ifeq (1,$(GNRC_NETIF_NUMOF))
-    ifeq (,$(filter gnrc_sixlowpan_nd_router,$(USEMODULE)))
-      USEMODULE += gnrc_ndp_router
-    endif
-  else
-    USEMODULE += gnrc_ndp_router
-  endif
-endif
-
-ifneq (,$(filter gnrc_ndp_host,$(USEMODULE)))
-  USEMODULE += gnrc_ndp_node
-  USEMODULE += random
-  USEMODULE += xtimer
-endif
-
-ifneq (,$(filter gnrc_ndp_router,$(USEMODULE)))
-  USEMODULE += gnrc_ndp_node
-  USEMODULE += random
-  USEMODULE += xtimer
-endif
-
-ifneq (,$(filter gnrc_ndp_node,$(USEMODULE)))
-  USEMODULE += gnrc_ndp_internal
-endif
-
-ifneq (,$(filter gnrc_ndp_%,$(USEMODULE)))
-  USEMODULE += gnrc_ndp
 endif
 
 ifneq (,$(filter gnrc_ndp,$(USEMODULE)))
-  ifneq (,$(filter gnrc_sixlowpan,$(USEMODULE)))
-    USEMODULE += gnrc_sixlowpan_nd
-  else
-    USEMODULE += gnrc_ndp_node
-  endif
-  USEMODULE += gnrc_ndp_internal
-  USEMODULE += gnrc_icmpv6
-  USEMODULE += random
-  USEMODULE += xtimer
-endif
-
-ifneq (,$(filter gnrc_ndp2,$(USEMODULE)))
   USEMODULE += gnrc_icmpv6
+  USEMODULE += gnrc_netif
 endif
 
 ifneq (,$(filter gnrc_icmpv6_echo,$(USEMODULE)))
@@ -297,14 +234,15 @@ endif
 
 ifneq (,$(filter gnrc_ipv6_router,$(USEMODULE)))
   USEMODULE += gnrc_ipv6
+  USEMODULE += gnrc_ipv6_nib_router
 endif
 
 ifneq (,$(filter gnrc_ipv6,$(USEMODULE)))
   USEMODULE += inet_csum
   USEMODULE += ipv6_addr
   USEMODULE += gnrc_ipv6_hdr
-  USEMODULE += gnrc_ipv6_nc
-  USEMODULE += gnrc_ipv6_netif
+  USEMODULE += gnrc_ipv6_nib
+  USEMODULE += gnrc_netif
 endif
 
 ifneq (,$(filter gnrc_ipv6_hdr,$(USEMODULE)))
@@ -321,10 +259,6 @@ ifneq (,$(filter ipv6_hdr,$(USEMODULE)))
   USEMODULE += ipv6_addr
 endif
 
-ifneq (,$(filter gnrc_ipv6_nc,$(USEMODULE)))
-  USEMODULE += ipv6_addr
-endif
-
 ifneq (,$(filter gnrc_ipv6_nib_6lbr,$(USEMODULE)))
   USEMODULE += gnrc_ipv6_nib_6lr
 endif
@@ -345,18 +279,11 @@ endif
 
 ifneq (,$(filter gnrc_ipv6_nib,$(USEMODULE)))
   USEMODULE += evtimer
-  USEMODULE += gnrc_ndp2
+  USEMODULE += gnrc_ndp
   USEMODULE += ipv6_addr
   USEMODULE += random
 endif
 
-ifneq (,$(filter gnrc_ipv6_netif,$(USEMODULE)))
-  USEMODULE += ipv6_addr
-  USEMODULE += gnrc_netif
-  USEMODULE += bitfield
-  USEMODULE += xtimer
-endif
-
 ifneq (,$(filter gnrc_udp,$(USEMODULE)))
   USEMODULE += inet_csum
   USEMODULE += udp
@@ -559,8 +486,8 @@ ifneq (,$(filter netstats_%, $(USEMODULE)))
 endif
 
 ifneq (,$(filter gnrc_lwmac,$(USEMODULE)))
+  USEMODULE += gnrc_netif
   USEMODULE += gnrc_mac
-  USEMODULE += gnrc_netdev
   FEATURES_REQUIRED += periph_rtt
 endif
 

boards/cc2538dk/Makefile.dep

@@ -1,6 +1,5 @@
 ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
   USEMODULE += netif
   USEMODULE += cc2538_rf
-  USEMODULE += gnrc_netdev
   USEMODULE += netdev_ieee802154
 endif

boards/openmote-cc2538/Makefile.dep

@@ -1,6 +1,5 @@
 ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
   USEMODULE += netif
   USEMODULE += cc2538_rf
-  USEMODULE += gnrc_netdev
   USEMODULE += netdev_ieee802154
 endif

boards/remote-common/Makefile.dep

@@ -1,7 +1,6 @@
 ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
   USEMODULE += netif
   USEMODULE += cc2538_rf
-  USEMODULE += gnrc_netdev
   USEMODULE += netdev_ieee802154
 endif
 

cpu/nrf5x_common/radio/nrfmin/nrfmin_gnrc.c

@@ -20,11 +20,7 @@
 
 #include "net/gnrc.h"
 #include "thread.h"
-#ifdef MODULE_GNRC_NETIF2
-#include "net/gnrc/netif2.h"
-#else
-#include "net/gnrc/netdev.h"
-#endif
+#include "net/gnrc/netif.h"
 
 #include "nrfmin_gnrc.h"
 
@@ -36,11 +32,7 @@
  * @{
  */
 #ifndef NRFMIN_GNRC_THREAD_PRIO
-#ifdef MODULE_GNRC_NETIF2
-#define NRFMIN_GNRC_THREAD_PRIO     GNRC_NETIF2_PRIO
-#else
-#define NRFMIN_GNRC_THREAD_PRIO     GNRC_NETDEV_MAC_PRIO
-#endif
+#define NRFMIN_GNRC_THREAD_PRIO     GNRC_NETIF_PRIO
 #endif
 
 #ifndef NRFMIN_GNRC_STACKSIZE
@@ -58,14 +50,6 @@
  */
 static char stack[NRFMIN_GNRC_STACKSIZE];
 
-#ifndef MODULE_GNRC_NETIF2
-/**
- * @brief   Allocate the GNRC netdev data structure.
- */
-static gnrc_netdev_t plug;
-#endif
-
-
 static int hdr_netif_to_nrfmin(nrfmin_hdr_t *nrfmin, gnrc_pktsnip_t *pkt)
 {
     gnrc_netif_hdr_t *netif = (gnrc_netif_hdr_t *)pkt->data;
@@ -92,11 +76,7 @@ static int hdr_netif_to_nrfmin(nrfmin_hdr_t *nrfmin, gnrc_pktsnip_t *pkt)
     return 0;
 }
 
-#ifdef MODULE_GNRC_NETIF2
-static int gnrc_nrfmin_send(gnrc_netif2_t *dev, gnrc_pktsnip_t *pkt)
-#else
-static int gnrc_nrfmin_send(gnrc_netdev_t *dev, gnrc_pktsnip_t *pkt)
-#endif
+static int gnrc_nrfmin_send(gnrc_netif_t *dev, gnrc_pktsnip_t *pkt)
 {
     int res;
     struct iovec *vec;
@@ -139,11 +119,7 @@ static int gnrc_nrfmin_send(gnrc_netdev_t *dev, gnrc_pktsnip_t *pkt)
     return res;
 }
 
-#ifdef MODULE_GNRC_NETIF2
-static gnrc_pktsnip_t *gnrc_nrfmin_recv(gnrc_netif2_t *dev)
-#else
-static gnrc_pktsnip_t *gnrc_nrfmin_recv(gnrc_netdev_t *dev)
-#endif
+static gnrc_pktsnip_t *gnrc_nrfmin_recv(gnrc_netif_t *dev)
 {
     int pktsize;
     nrfmin_hdr_t *nrfmin;
@@ -204,30 +180,17 @@ static gnrc_pktsnip_t *gnrc_nrfmin_recv(gnrc_netdev_t *dev)
     return pkt_snip;
 }
 
-#ifdef MODULE_GNRC_NETIF2
-static const gnrc_netif2_ops_t gnrc_nrfmin_ops = {
+static const gnrc_netif_ops_t gnrc_nrfmin_ops = {
     .send = gnrc_nrfmin_send,
     .recv = gnrc_nrfmin_recv,
-    .get = gnrc_netif2_get_from_netdev,
-    .set = gnrc_netif2_set_from_netdev,
+    .get = gnrc_netif_get_from_netdev,
+    .set = gnrc_netif_set_from_netdev,
 };
-#endif
 
 void gnrc_nrfmin_init(void)
 {
     /* setup the NRFMIN driver */
     nrfmin_setup();
-#ifdef MODULE_GNRC_NETIF2
-    gnrc_netif2_create(stack, sizeof(stack), NRFMIN_GNRC_THREAD_PRIO, "nrfmin",
-                       (netdev_t *)&nrfmin_dev, &gnrc_nrfmin_ops);
-#else
-    /* initialize the GNRC plug struct */
-    plug.send = gnrc_nrfmin_send;
-    plug.recv = gnrc_nrfmin_recv;
-    plug.dev = &nrfmin_dev;
-
-    gnrc_netdev_init(stack, sizeof(stack),
-                      NRFMIN_GNRC_THREAD_PRIO,
-                      "nrfmin", &plug);
-#endif
+    gnrc_netif_create(stack, sizeof(stack), NRFMIN_GNRC_THREAD_PRIO, "nrfmin",
+                      (netdev_t *)&nrfmin_dev, &gnrc_nrfmin_ops);
 }