From 25b568e6d5664d3aa876b7dde48dedc3c4f2e942 Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Sun, 29 Mar 2015 18:49:04 +0200 Subject: [PATCH] ipv6_netif: fix prefix for address flags Since NDP will introduce interface specific flags this naming might get confusing --- sys/include/net/ng_ipv6/netif.h | 6 +++--- sys/net/network_layer/ng_ipv6/netif/ng_ipv6_netif.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/include/net/ng_ipv6/netif.h b/sys/include/net/ng_ipv6/netif.h index 52d253f006..da65053cc3 100644 --- a/sys/include/net/ng_ipv6/netif.h +++ b/sys/include/net/ng_ipv6/netif.h @@ -77,8 +77,8 @@ extern "C" { * RFC 4291, section 2.6 * */ -#define NG_IPV6_NETIF_FLAGS_UNICAST (0x00) /**< unicast address */ -#define NG_IPV6_NETIF_FLAGS_NON_UNICAST (0x01) /**< non-unicast address */ +#define NG_IPV6_NETIF_ADDR_FLAGS_UNICAST (0x00) /**< unicast address */ +#define NG_IPV6_NETIF_ADDR_FLAGS_NON_UNICAST (0x01) /**< non-unicast address */ /** * @} */ @@ -267,7 +267,7 @@ ng_ipv6_addr_t *ng_ipv6_netif_find_best_src_addr(kernel_pid_t pid, const ng_ipv6 static inline bool ng_ipv6_netif_addr_is_non_unicast(const ng_ipv6_addr_t *addr) { return (bool)(container_of(addr, ng_ipv6_netif_addr_t, addr)->flags & - NG_IPV6_NETIF_FLAGS_NON_UNICAST); + NG_IPV6_NETIF_ADDR_FLAGS_NON_UNICAST); } diff --git a/sys/net/network_layer/ng_ipv6/netif/ng_ipv6_netif.c b/sys/net/network_layer/ng_ipv6/netif/ng_ipv6_netif.c index afdfac2f6c..016a63ef74 100644 --- a/sys/net/network_layer/ng_ipv6/netif/ng_ipv6_netif.c +++ b/sys/net/network_layer/ng_ipv6/netif/ng_ipv6_netif.c @@ -54,12 +54,12 @@ static int _add_addr_to_entry(ng_ipv6_netif_t *entry, const ng_ipv6_addr_t *addr entry->addrs[i].prefix_len = NG_IPV6_ADDR_BIT_LEN; } - entry->addrs[i].flags = NG_IPV6_NETIF_FLAGS_NON_UNICAST; + entry->addrs[i].flags = NG_IPV6_NETIF_ADDR_FLAGS_NON_UNICAST; } else { entry->addrs[i].prefix_len = prefix_len; - entry->addrs[i].flags = NG_IPV6_NETIF_FLAGS_UNICAST; + entry->addrs[i].flags = NG_IPV6_NETIF_ADDR_FLAGS_UNICAST; } return 0;