Merge pull request #16947 from miri64/gnrc_ipv6_nib/fix/queue-pkts-on…

…-6lbr gnrc_ipv6_nib: queue packets that trigger probing on border router
RIOT-OS · Oct 5, 2021 · e804a73 · e804a73
2 parents c4cc50c + b869184
commit e804a73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/sys/include/net/gnrc/ipv6/nib/conf.h b/sys/include/net/gnrc/ipv6/nib/conf.h
@@ -38,6 +38,9 @@ extern "C" {
 #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

diff --git a/sys/net/gnrc/network_layer/ipv6/nib/Kconfig b/sys/net/gnrc/network_layer/ipv6/nib/Kconfig
@@ -47,6 +47,7 @@ config GNRC_IPV6_NIB_QUEUE_PKT
 
 config GNRC_IPV6_NIB_ARSM
     bool "Use classic NDP address resolution state-machine"
+    default y if USEMODULE_GNRC_IPV6_NIB_6LBR
     default n if USEMODULE_GNRC_IPV6_NIB_6LN && !GNRC_IPV6_NIB_6LR
     default y