From 7e6356539ad21155a67fe8cda1e7d967f772b1fb Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Wed, 28 Nov 2018 16:39:57 +0100 Subject: [PATCH] gnrc_netif: fix compile time logic for is_6ln() --- sys/include/net/gnrc/netif/internal.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/include/net/gnrc/netif/internal.h b/sys/include/net/gnrc/netif/internal.h index 173fc28905b8..3d8a899574d1 100644 --- a/sys/include/net/gnrc/netif/internal.h +++ b/sys/include/net/gnrc/netif/internal.h @@ -366,10 +366,7 @@ bool gnrc_netif_is_6lo(const gnrc_netif_t *netif); * RFC 6775 * * @attention Requires prior locking - * @note Assumed to be true, when @ref GNRC_NETIF_NUMOF == 1 and - * @ref net_gnrc_sixlowpan module is included (and - * @ref GNRC_IPV6_NIB_CONF_6LN is not 0, otherwise assumed to be - * false). + * @note Assumed to be false, when @ref GNRC_IPV6_NIB_CONF_6LN is 0. * * @param[in] netif the network interface * @@ -378,13 +375,11 @@ bool gnrc_netif_is_6lo(const gnrc_netif_t *netif); * @return true, if the interface represents a 6LN * @return false, if the interface does not represent a 6LN */ -#if (GNRC_NETIF_NUMOF > 1) || !defined(MODULE_GNRC_SIXLOWPAN) || defined(DOXYGEN) +#if GNRC_IPV6_NIB_CONF_6LN || defined(DOXYGEN) static inline bool gnrc_netif_is_6ln(const gnrc_netif_t *netif) { return (netif->flags & GNRC_NETIF_FLAGS_6LN); } -#elif GNRC_IPV6_NIB_CONF_6LN -#define gnrc_netif_is_6ln(netif) (true) #else #define gnrc_netif_is_6ln(netif) (false) #endif