Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnrc_ipv6_nib: fix config for mixed 6lo/classic setup #20167

Merged
merged 2 commits into from
Dec 20, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
gnrc_ipv6_nib: fix config for mixed 6lo/classic setup
  • Loading branch information
benpicco committed Dec 19, 2023
commit fa1f60f4ac62dfd9c8c85dc86b3b10382cc74a39
23 changes: 7 additions & 16 deletions sys/include/net/gnrc/ipv6/nib/conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
benpicco marked this conversation as resolved.
Show resolved Hide resolved
#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
Expand All @@ -75,6 +69,7 @@ extern "C" {
# endif
#endif
#endif
#endif

#ifdef MODULE_GNRC_IPV6_NIB_ROUTER
#define CONFIG_GNRC_IPV6_NIB_ROUTER 1
Expand Down Expand Up @@ -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
Expand Down
Loading