Skip to content

Commit d683afd

Browse files
miri64miri64
committed
Merge branch 'gnrc_netif2_integration/master' into git/fix/7979-backport
2 parents 4971a43 + abe721f commit d683afd

198 files changed

Lines changed: 8440 additions & 15669 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile.dep‎

Lines changed: 15 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ ifneq (,$(filter sntp,$(USEMODULE)))
3636
endif
3737

3838
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
39-
USEMODULE += gnrc_netif
40-
USEMODULE += gnrc_netdev
4139
USEMODULE += netdev_default
40+
USEMODULE += gnrc_netif
4241
endif
4342

4443
ifneq (,$(filter netdev_ieee802154,$(USEMODULE)))
@@ -51,15 +50,17 @@ ifneq (,$(filter gnrc_uhcpc,$(USEMODULE)))
5150
USEMODULE += fmt
5251
endif
5352

53+
ifneq (,$(filter uhcpc,$(USEMODULE)))
54+
USEMODULE += posix
55+
endif
56+
5457
ifneq (,$(filter nordic_softdevice_ble,$(USEPKG)))
5558
USEMODULE += softdevice_handler
5659
USEMODULE += ble_common
5760
USEMODULE += ble_6lowpan
5861
USEMODULE += gnrc_sixlowpan
5962
USEMODULE += gnrc_sixlowpan_iphc
6063
USEMODULE += gnrc_ipv6_default
61-
USEMODULE += gnrc_netdev
62-
USEMODULE += gnrc_ipv6_netif
6364
endif
6465

6566
ifneq (,$(filter gnrc_%,$(filter-out gnrc_netapi gnrc_netreg gnrc_netif% gnrc_pkt%,$(USEMODULE))))
@@ -92,9 +93,6 @@ endif
9293
ifneq (,$(filter netdev_tap,$(USEMODULE)))
9394
USEMODULE += netif
9495
USEMODULE += netdev_eth
95-
ifneq (,$(filter gnrc_%,$(USEMODULE)))
96-
USEMODULE += gnrc_netdev
97-
endif
9896
endif
9997

10098
ifneq (,$(filter gnrc_tftp,$(USEMODULE)))
@@ -138,29 +136,30 @@ endif
138136

139137
ifneq (,$(filter gnrc_sixlowpan_default,$(USEMODULE)))
140138
USEMODULE += gnrc_ipv6_default
139+
USEMODULE += gnrc_ipv6_nib_6ln
141140
USEMODULE += gnrc_sixlowpan
142-
USEMODULE += gnrc_sixlowpan_nd
143141
USEMODULE += gnrc_sixlowpan_frag
144142
USEMODULE += gnrc_sixlowpan_iphc
145143
endif
146144

147145
ifneq (,$(filter gnrc_sixlowpan_router_default,$(USEMODULE)))
148146
USEMODULE += gnrc_ipv6_router_default
147+
USEMODULE += gnrc_ipv6_nib_6lr
149148
USEMODULE += gnrc_sixlowpan_router
150149
USEMODULE += gnrc_sixlowpan_frag
151150
USEMODULE += gnrc_sixlowpan_iphc
152151
endif
153152

154153
ifneq (,$(filter gnrc_sixlowpan_border_router_default,$(USEMODULE)))
154+
USEMODULE += gnrc_ipv6_nib_6lbr
155155
USEMODULE += gnrc_ipv6_router_default
156-
USEMODULE += gnrc_sixlowpan_nd_border_router
157156
USEMODULE += gnrc_sixlowpan_router
158157
USEMODULE += gnrc_sixlowpan_frag
159158
USEMODULE += gnrc_sixlowpan_iphc
160159
endif
161160

162161
ifneq (,$(filter gnrc_sixlowpan_router,$(USEMODULE)))
163-
USEMODULE += gnrc_sixlowpan_nd_router
162+
USEMODULE += gnrc_ipv6_router
164163
endif
165164

166165
ifneq (,$(filter gnrc_sixlowpan_frag,$(USEMODULE)))
@@ -176,7 +175,6 @@ endif
176175

177176
ifneq (,$(filter gnrc_sixlowpan,$(USEMODULE)))
178177
USEMODULE += gnrc_ipv6
179-
USEMODULE += gnrc_sixlowpan_netif
180178
USEMODULE += sixlowpan
181179
endif
182180

@@ -185,80 +183,19 @@ ifneq (,$(filter gnrc_sixlowpan_ctx,$(USEMODULE)))
185183
USEMODULE += xtimer
186184
endif
187185

188-
ifneq (,$(filter gnrc_sixlowpan_nd_border_router,$(USEMODULE)))
189-
USEMODULE += gnrc_sixlowpan_nd_router
190-
endif
191-
192-
ifneq (,$(filter gnrc_sixlowpan_nd_router,$(USEMODULE)))
193-
USEMODULE += gnrc_sixlowpan_nd
194-
endif
195-
196-
ifneq (,$(filter gnrc_sixlowpan_nd,$(USEMODULE)))
197-
USEMODULE += gnrc_ndp
198-
USEMODULE += gnrc_ndp_internal
199-
USEMODULE += gnrc_sixlowpan_ctx
200-
USEMODULE += random
201-
USEMODULE += xtimer
202-
endif
203-
204186
ifneq (,$(filter gnrc_ipv6_default,$(USEMODULE)))
205187
USEMODULE += gnrc_ipv6
206188
USEMODULE += gnrc_icmpv6
207-
ifeq (1,$(GNRC_NETIF_NUMOF))
208-
ifeq (,$(filter gnrc_sixlowpan_nd,$(USEMODULE)))
209-
USEMODULE += gnrc_ndp_host
210-
endif
211-
else
212-
USEMODULE += gnrc_ndp_host
213-
endif
214189
endif
215190

216191
ifneq (,$(filter gnrc_ipv6_router_default,$(USEMODULE)))
217192
USEMODULE += gnrc_ipv6_router
218193
USEMODULE += gnrc_icmpv6
219-
ifeq (1,$(GNRC_NETIF_NUMOF))
220-
ifeq (,$(filter gnrc_sixlowpan_nd_router,$(USEMODULE)))
221-
USEMODULE += gnrc_ndp_router
222-
endif
223-
else
224-
USEMODULE += gnrc_ndp_router
225-
endif
226-
endif
227-
228-
ifneq (,$(filter gnrc_ndp_host,$(USEMODULE)))
229-
USEMODULE += gnrc_ndp_node
230-
USEMODULE += random
231-
USEMODULE += xtimer
232-
endif
233-
234-
ifneq (,$(filter gnrc_ndp_router,$(USEMODULE)))
235-
USEMODULE += gnrc_ndp_node
236-
USEMODULE += random
237-
USEMODULE += xtimer
238-
endif
239-
240-
ifneq (,$(filter gnrc_ndp_node,$(USEMODULE)))
241-
USEMODULE += gnrc_ndp_internal
242-
endif
243-
244-
ifneq (,$(filter gnrc_ndp_%,$(USEMODULE)))
245-
USEMODULE += gnrc_ndp
246194
endif
247195

248196
ifneq (,$(filter gnrc_ndp,$(USEMODULE)))
249-
ifneq (,$(filter gnrc_sixlowpan,$(USEMODULE)))
250-
USEMODULE += gnrc_sixlowpan_nd
251-
else
252-
USEMODULE += gnrc_ndp_node
253-
endif
254-
USEMODULE += gnrc_ndp_internal
255-
USEMODULE += gnrc_icmpv6
256-
USEMODULE += random
257-
USEMODULE += xtimer
258-
endif
259-
260-
ifneq (,$(filter gnrc_ndp2,$(USEMODULE)))
261197
USEMODULE += gnrc_icmpv6
198+
USEMODULE += gnrc_netif
262199
endif
263200

264201
ifneq (,$(filter gnrc_icmpv6_echo,$(USEMODULE)))
@@ -297,14 +234,15 @@ endif
297234

298235
ifneq (,$(filter gnrc_ipv6_router,$(USEMODULE)))
299236
USEMODULE += gnrc_ipv6
237+
USEMODULE += gnrc_ipv6_nib_router
300238
endif
301239

302240
ifneq (,$(filter gnrc_ipv6,$(USEMODULE)))
303241
USEMODULE += inet_csum
304242
USEMODULE += ipv6_addr
305243
USEMODULE += gnrc_ipv6_hdr
306-
USEMODULE += gnrc_ipv6_nc
307-
USEMODULE += gnrc_ipv6_netif
244+
USEMODULE += gnrc_ipv6_nib
245+
USEMODULE += gnrc_netif
308246
endif
309247

310248
ifneq (,$(filter gnrc_ipv6_hdr,$(USEMODULE)))
@@ -321,10 +259,6 @@ ifneq (,$(filter ipv6_hdr,$(USEMODULE)))
321259
USEMODULE += ipv6_addr
322260
endif
323261

324-
ifneq (,$(filter gnrc_ipv6_nc,$(USEMODULE)))
325-
USEMODULE += ipv6_addr
326-
endif
327-
328262
ifneq (,$(filter gnrc_ipv6_nib_6lbr,$(USEMODULE)))
329263
USEMODULE += gnrc_ipv6_nib_6lr
330264
endif
@@ -345,18 +279,11 @@ endif
345279

346280
ifneq (,$(filter gnrc_ipv6_nib,$(USEMODULE)))
347281
USEMODULE += evtimer
348-
USEMODULE += gnrc_ndp2
282+
USEMODULE += gnrc_ndp
349283
USEMODULE += ipv6_addr
350284
USEMODULE += random
351285
endif
352286

353-
ifneq (,$(filter gnrc_ipv6_netif,$(USEMODULE)))
354-
USEMODULE += ipv6_addr
355-
USEMODULE += gnrc_netif
356-
USEMODULE += bitfield
357-
USEMODULE += xtimer
358-
endif
359-
360287
ifneq (,$(filter gnrc_udp,$(USEMODULE)))
361288
USEMODULE += inet_csum
362289
USEMODULE += udp
@@ -559,8 +486,8 @@ ifneq (,$(filter netstats_%, $(USEMODULE)))
559486
endif
560487

561488
ifneq (,$(filter gnrc_lwmac,$(USEMODULE)))
489+
USEMODULE += gnrc_netif
562490
USEMODULE += gnrc_mac
563-
USEMODULE += gnrc_netdev
564491
FEATURES_REQUIRED += periph_rtt
565492
endif
566493

‎boards/cc2538dk/Makefile.dep‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
22
USEMODULE += netif
33
USEMODULE += cc2538_rf
4-
USEMODULE += gnrc_netdev
54
USEMODULE += netdev_ieee802154
65
endif

‎boards/openmote-cc2538/Makefile.dep‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
22
USEMODULE += netif
33
USEMODULE += cc2538_rf
4-
USEMODULE += gnrc_netdev
54
USEMODULE += netdev_ieee802154
65
endif

‎boards/remote-common/Makefile.dep‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
22
USEMODULE += netif
33
USEMODULE += cc2538_rf
4-
USEMODULE += gnrc_netdev
54
USEMODULE += netdev_ieee802154
65
endif
76

‎cpu/nrf5x_common/radio/nrfmin/nrfmin_gnrc.c‎

Lines changed: 9 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@
2020

2121
#include "net/gnrc.h"
2222
#include "thread.h"
23-
#ifdef MODULE_GNRC_NETIF2
24-
#include "net/gnrc/netif2.h"
25-
#else
26-
#include "net/gnrc/netdev.h"
27-
#endif
23+
#include "net/gnrc/netif.h"
2824

2925
#include "nrfmin_gnrc.h"
3026

@@ -36,11 +32,7 @@
3632
* @{
3733
*/
3834
#ifndef NRFMIN_GNRC_THREAD_PRIO
39-
#ifdef MODULE_GNRC_NETIF2
40-
#define NRFMIN_GNRC_THREAD_PRIO GNRC_NETIF2_PRIO
41-
#else
42-
#define NRFMIN_GNRC_THREAD_PRIO GNRC_NETDEV_MAC_PRIO
43-
#endif
35+
#define NRFMIN_GNRC_THREAD_PRIO GNRC_NETIF_PRIO
4436
#endif
4537

4638
#ifndef NRFMIN_GNRC_STACKSIZE
@@ -58,14 +50,6 @@
5850
*/
5951
static char stack[NRFMIN_GNRC_STACKSIZE];
6052

61-
#ifndef MODULE_GNRC_NETIF2
62-
/**
63-
* @brief Allocate the GNRC netdev data structure.
64-
*/
65-
static gnrc_netdev_t plug;
66-
#endif
67-
68-
6953
static int hdr_netif_to_nrfmin(nrfmin_hdr_t *nrfmin, gnrc_pktsnip_t *pkt)
7054
{
7155
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)
9276
return 0;
9377
}
9478

95-
#ifdef MODULE_GNRC_NETIF2
96-
static int gnrc_nrfmin_send(gnrc_netif2_t *dev, gnrc_pktsnip_t *pkt)
97-
#else
98-
static int gnrc_nrfmin_send(gnrc_netdev_t *dev, gnrc_pktsnip_t *pkt)
99-
#endif
79+
static int gnrc_nrfmin_send(gnrc_netif_t *dev, gnrc_pktsnip_t *pkt)
10080
{
10181
int res;
10282
struct iovec *vec;
@@ -139,11 +119,7 @@ static int gnrc_nrfmin_send(gnrc_netdev_t *dev, gnrc_pktsnip_t *pkt)
139119
return res;
140120
}
141121

142-
#ifdef MODULE_GNRC_NETIF2
143-
static gnrc_pktsnip_t *gnrc_nrfmin_recv(gnrc_netif2_t *dev)
144-
#else
145-
static gnrc_pktsnip_t *gnrc_nrfmin_recv(gnrc_netdev_t *dev)
146-
#endif
122+
static gnrc_pktsnip_t *gnrc_nrfmin_recv(gnrc_netif_t *dev)
147123
{
148124
int pktsize;
149125
nrfmin_hdr_t *nrfmin;
@@ -204,30 +180,17 @@ static gnrc_pktsnip_t *gnrc_nrfmin_recv(gnrc_netdev_t *dev)
204180
return pkt_snip;
205181
}
206182

207-
#ifdef MODULE_GNRC_NETIF2
208-
static const gnrc_netif2_ops_t gnrc_nrfmin_ops = {
183+
static const gnrc_netif_ops_t gnrc_nrfmin_ops = {
209184
.send = gnrc_nrfmin_send,
210185
.recv = gnrc_nrfmin_recv,
211-
.get = gnrc_netif2_get_from_netdev,
212-
.set = gnrc_netif2_set_from_netdev,
186+
.get = gnrc_netif_get_from_netdev,
187+
.set = gnrc_netif_set_from_netdev,
213188
};
214-
#endif
215189

216190
void gnrc_nrfmin_init(void)
217191
{
218192
/* setup the NRFMIN driver */
219193
nrfmin_setup();
220-
#ifdef MODULE_GNRC_NETIF2
221-
gnrc_netif2_create(stack, sizeof(stack), NRFMIN_GNRC_THREAD_PRIO, "nrfmin",
222-
(netdev_t *)&nrfmin_dev, &gnrc_nrfmin_ops);
223-
#else
224-
/* initialize the GNRC plug struct */
225-
plug.send = gnrc_nrfmin_send;
226-
plug.recv = gnrc_nrfmin_recv;
227-
plug.dev = &nrfmin_dev;
228-
229-
gnrc_netdev_init(stack, sizeof(stack),
230-
NRFMIN_GNRC_THREAD_PRIO,
231-
"nrfmin", &plug);
232-
#endif
194+
gnrc_netif_create(stack, sizeof(stack), NRFMIN_GNRC_THREAD_PRIO, "nrfmin",
195+
(netdev_t *)&nrfmin_dev, &gnrc_nrfmin_ops);
233196
}

0 commit comments

Comments
 (0)