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

Merge pull request #14886 from miri64/gnrc/fix/circ-deps

Browse Source 
gnrc: remove circular module dependencies
This commit is contained in:
Francisco 2020-09-09 09:06:28 +02:00 committed by GitHub
commit cb6b65e7ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.dep
View File

@ -221,9 +221,6 @@ ifneq (,$(filter ieee802154 nrfmin esp_now cc110x gnrc_sixloenc,$(USEMODULE)))
ifneq (,$(filter gnrc_ipv6, $(USEMODULE)))
USEMODULE += gnrc_sixlowpan
endif
ifneq (,$(filter gnrc_ipv6_router, $(USEMODULE)))
USEMODULE += gnrc_sixlowpan_router
endif
ifneq (,$(filter gnrc_ipv6_default, $(USEMODULE)))
USEMODULE += gnrc_sixlowpan_default
endif
@ -236,7 +233,6 @@ ifneq (,$(filter ieee802154 nrfmin esp_now cc110x gnrc_sixloenc,$(USEMODULE)))
endif
ifneq (,$(filter gnrc_sixlowpan_default,$(USEMODULE)))
USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_ipv6_nib_6ln
USEMODULE += gnrc_sixlowpan
USEMODULE += gnrc_sixlowpan_frag
@ -244,9 +240,7 @@ ifneq (,$(filter gnrc_sixlowpan_default,$(USEMODULE)))
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
@ -254,15 +248,10 @@ endif
ifneq (,$(filter gnrc_sixlowpan_border_router_default,$(USEMODULE)))
USEMODULE += gnrc_ipv6_nib_6lbr
USEMODULE += gnrc_ipv6_router_default
USEMODULE += gnrc_sixlowpan_router
USEMODULE += gnrc_sixlowpan_frag
USEMODULE += gnrc_sixlowpan_iphc
endif
ifneq (,$(filter gnrc_sixlowpan_router,$(USEMODULE)))
USEMODULE += gnrc_ipv6_router
endif
ifneq (,$(filter gnrc_sixlowpan_frag,$(USEMODULE)))
USEMODULE += gnrc_sixlowpan
USEMODULE += gnrc_sixlowpan_frag_fb
@ -315,21 +304,27 @@ endif
ifneq (,$(filter gnrc_ndp,$(USEMODULE)))
USEMODULE += gnrc_icmpv6
USEMODULE += gnrc_ipv6_hdr
USEMODULE += gnrc_netif
endif
ifneq (,$(filter gnrc_icmpv6_echo,$(USEMODULE)))
USEMODULE += gnrc_icmpv6
USEMODULE += gnrc_ipv6_hdr
USEMODULE += gnrc_netif_hdr
endif
ifneq (,$(filter gnrc_icmpv6_error,$(USEMODULE)))
USEMODULE += gnrc_icmpv6
USEMODULE += gnrc_ipv6_hdr
USEMODULE += gnrc_netif_hdr
endif
ifneq (,$(filter gnrc_icmpv6,$(USEMODULE)))
USEMODULE += inet_csum
USEMODULE += gnrc_ipv6
USEMODULE += ipv6_hdr
USEMODULE += gnrc_nettype_icmpv6
USEMODULE += gnrc_nettype_ipv6
USEMODULE += icmpv6
endif
@ -351,7 +346,7 @@ ifneq (,$(filter gnrc_ipv6_ext_rh,$(USEMODULE)))
endif
ifneq (,$(filter gnrc_ipv6_ext,$(USEMODULE)))
USEMODULE += gnrc_ipv6
USEMODULE += gnrc_nettype_ipv6
USEMODULE += gnrc_nettype_ipv6_ext
endif
@ -420,6 +415,7 @@ ifneq (,$(filter gnrc_ipv6_nib,$(USEMODULE)))
USEMODULE += evtimer
USEMODULE += gnrc_ndp
USEMODULE += gnrc_netif
USEMODULE += gnrc_netif_ipv6
USEMODULE += ipv6_addr
USEMODULE += random
endif

1
makefiles/pseudomodules.inc.mk
View File

@ -52,7 +52,6 @@ PSEUDOMODULES += gnrc_sixlowpan_default
PSEUDOMODULES += gnrc_sixlowpan_frag_hint
PSEUDOMODULES += gnrc_sixlowpan_iphc_nhc
PSEUDOMODULES += gnrc_sixlowpan_nd_border_router
PSEUDOMODULES += gnrc_sixlowpan_router
PSEUDOMODULES += gnrc_sixlowpan_router_default
PSEUDOMODULES += gnrc_sock_async
PSEUDOMODULES += gnrc_sock_check_reuse

6
sys/net/gnrc/netif/gnrc_netif.c
View File

@ -589,8 +589,9 @@ int gnrc_netif_ipv6_addr_add_internal(gnrc_netif_t *netif,
gnrc_netif_ipv6_bus_post(netif, GNRC_IPV6_EVENT_ADDR_VALID, &netif->ipv6.addrs[idx]);
}
#if IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_SLAAC)
else if (!gnrc_netif_is_6ln(netif)) {
else if (IS_USED(MODULE_GNRC_IPV6) &&
IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_SLAAC) &&
!gnrc_netif_is_6ln(netif)) {
/* cast to remove const qualifier (will still be used NIB internally as
* const) */
msg_t msg = { .type = GNRC_IPV6_NIB_DAD,
@ -598,7 +599,6 @@ int gnrc_netif_ipv6_addr_add_internal(gnrc_netif_t *netif,
msg_send(&msg, gnrc_ipv6_pid);
}
#endif
#else
(void)pfx_len;
#endif

2
sys/net/gnrc/network_layer/ipv6/hdr/gnrc_ipv6_hdr.c
View File

@ -26,7 +26,7 @@ static char addr_str[IPV6_ADDR_MAX_STR_LEN];
#endif
/* For independent testing */
#ifdef MODULE_GNRC_IPV6
#ifdef MODULE_GNRC_NETTYPE_IPV6
#define HDR_NETTYPE (GNRC_NETTYPE_IPV6)
#else
#define HDR_NETTYPE (GNRC_NETTYPE_UNDEF)

1
sys/net/gnrc/network_layer/ipv6/nib/_nib-arsm.h
View File

@ -28,6 +28,7 @@
#include "net/gnrc/netif.h"
#include "net/ndp.h"
#include "net/icmpv6.h"
#include "net/ipv6/hdr.h"
#include "_nib-internal.h"

1
sys/net/gnrc/network_layer/ipv6/nib/_nib-slaac.c
View File

@ -18,6 +18,7 @@
#include "log.h"
#include "luid.h"
#include "net/gnrc/ipv6/nib.h"
#include "net/gnrc/netif/internal.h"
#include "_nib-6ln.h"

1
sys/net/gnrc/network_layer/ipv6/nib/nib_ft.c
View File

@ -18,6 +18,7 @@
#include "_nib-internal.h"
#include "net/gnrc/ipv6/nib.h"
#include "net/gnrc/ipv6/nib/ft.h"
int gnrc_ipv6_nib_ft_get(const ipv6_addr_t *dst, gnrc_pktsnip_t *pkt,

1
tests/gnrc_ndp/Makefile
View File

@ -3,6 +3,7 @@ include ../Makefile.tests_common
USEMODULE += gnrc_ipv6_nib_router
USEMODULE += gnrc_ndp
USEMODULE += gnrc_netif
USEMODULE += gnrc_nettype_ipv6
USEMODULE += embunit
USEMODULE += netdev_ieee802154
USEMODULE += netdev_test

2
tests/gnrc_sixlowpan/Makefile
View File

@ -6,6 +6,8 @@ USEMODULE += netdev_ieee802154
USEMODULE += netdev_test
# 6LoWPAN and its extensions
USEMODULE += gnrc_sixlowpan_default
# IPv6 host support
USEMODULE += gnrc_ipv6_default
# UDP
USEMODULE += gnrc_udp
# Dumps packets