diff --git a/makefiles/pseudomodules.inc.mk b/makefiles/pseudomodules.inc.mk index a58f81e4b067..8cba82888eb9 100644 --- a/makefiles/pseudomodules.inc.mk +++ b/makefiles/pseudomodules.inc.mk @@ -99,6 +99,7 @@ PSEUDOMODULES += gnrc_dhcpv6_client_simple_pd ## @} PSEUDOMODULES += gnrc_ipv6_auto_subnets_auto_init PSEUDOMODULES += gnrc_ipv6_auto_subnets_simple +PSEUDOMODULES += gnrc_ipv6_classic PSEUDOMODULES += gnrc_ipv6_default PSEUDOMODULES += gnrc_ipv6_ext_frag_stats PSEUDOMODULES += gnrc_ipv6_router diff --git a/sys/include/net/gnrc/ipv6/nib/conf.h b/sys/include/net/gnrc/ipv6/nib/conf.h index 4ab6ba820a74..fddbc03e8005 100644 --- a/sys/include/net/gnrc/ipv6/nib/conf.h +++ b/sys/include/net/gnrc/ipv6/nib/conf.h @@ -35,12 +35,6 @@ extern "C" { #ifndef CONFIG_GNRC_IPV6_NIB_6LBR #define CONFIG_GNRC_IPV6_NIB_6LBR 1 #endif -#ifndef CONFIG_GNRC_IPV6_NIB_SLAAC -#define CONFIG_GNRC_IPV6_NIB_SLAAC 1 -#endif -#ifndef CONFIG_GNRC_IPV6_NIB_QUEUE_PKT -#define CONFIG_GNRC_IPV6_NIB_QUEUE_PKT 1 -#endif #ifndef CONFIG_GNRC_IPV6_NIB_NUMOF #define CONFIG_GNRC_IPV6_NIB_NUMOF (16) #endif @@ -50,21 +44,21 @@ extern "C" { #ifndef CONFIG_GNRC_IPV6_NIB_6LR #define CONFIG_GNRC_IPV6_NIB_6LR 1 #endif -#ifndef CONFIG_GNRC_IPV6_NIB_SLAAC -#define CONFIG_GNRC_IPV6_NIB_SLAAC 0 -#endif #endif #ifdef MODULE_GNRC_IPV6_NIB_6LN #ifndef CONFIG_GNRC_IPV6_NIB_6LN #define CONFIG_GNRC_IPV6_NIB_6LN 1 #endif -#ifndef CONFIG_GNRC_IPV6_NIB_SLAAC -#define CONFIG_GNRC_IPV6_NIB_SLAAC 0 -#endif + +/* We are only a 6lo node with no 'classic' IPv6 interface */ +#ifndef MODULE_GNRC_IPV6_CLASSIC #ifndef CONFIG_GNRC_IPV6_NIB_QUEUE_PKT #define CONFIG_GNRC_IPV6_NIB_QUEUE_PKT 0 #endif +#ifndef CONFIG_GNRC_IPV6_NIB_SLAAC +#define CONFIG_GNRC_IPV6_NIB_SLAAC 0 +#endif #if !CONFIG_GNRC_IPV6_NIB_6LR # ifndef CONFIG_GNRC_IPV6_NIB_ARSM # define CONFIG_GNRC_IPV6_NIB_ARSM 0 @@ -75,6 +69,7 @@ extern "C" { # endif #endif #endif +#endif #ifdef MODULE_GNRC_IPV6_NIB_ROUTER #define CONFIG_GNRC_IPV6_NIB_ROUTER 1 @@ -178,12 +173,8 @@ extern "C" { * @brief queue packets for address resolution */ #ifndef CONFIG_GNRC_IPV6_NIB_QUEUE_PKT -#if CONFIG_GNRC_IPV6_NIB_6LN -#define CONFIG_GNRC_IPV6_NIB_QUEUE_PKT 0 -#else #define CONFIG_GNRC_IPV6_NIB_QUEUE_PKT 1 #endif -#endif /** * @brief handle NDP messages according for stateless address diff --git a/sys/net/gnrc/Makefile.dep b/sys/net/gnrc/Makefile.dep index e7e466e16301..8e36e56ecdb2 100644 --- a/sys/net/gnrc/Makefile.dep +++ b/sys/net/gnrc/Makefile.dep @@ -172,6 +172,14 @@ ifneq (,$(filter gnrc_netif_bus,$(USEMODULE))) USEMODULE += core_msg_bus endif +ifneq (,$(filter netdev_eth slipdev, $(USEMODULE))) + ifeq (,$(filter gnrc_sixloenc, $(USEMODULE))) + ifneq (,$(filter gnrc_ipv6, $(USEMODULE))) + USEMODULE += gnrc_ipv6_classic + endif + endif +endif + ifneq (,$(filter ieee802154 nrfmin esp_now cc110x gnrc_sixloenc,$(USEMODULE))) ifneq (,$(filter gnrc_ipv6, $(USEMODULE))) USEMODULE += gnrc_sixlowpan