1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-24 05:53:49 +01:00

gnrc_ipv6_nib: fix config for mixed 6lo/classic setup

This commit is contained in:
Benjamin Valentin 2023-12-11 23:44:03 +01:00
parent 8f7dad6c53
commit fa1f60f4ac

View File

@ -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