[PATCH net-next v2 2/4] ipv6: introdcue __ipv6_addr_needs_scope_id and ipv6_iface_scope_id helper functions
DORMANTno replies
From: Hannes Frederic Sowa <hidden>
Date: 2013-02-16 19:10:14
Subsystem:
networking [general], networking [ipv4/ipv6], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, David Ahern, Ido Schimmel, Linus Torvalds
__ipv6_addr_needs_scope_id checks if an ipv6 address needs to supply a 'sin6_scope_id != 0'. 'sin6_scope_id != 0' was enforced in case of link-local addresses. To support interface-local multicast these checks had to be enhanced and are now consolidated into these new helper functions. v2: a) unchanged Suggested-by: YOSHIFUJI Hideaki <redacted> Cc: YOSHIFUJI Hideaki <redacted> Cc: Brian Haley <redacted> Signed-off-by: Hannes Frederic Sowa <redacted> --- include/net/ipv6.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index a14700c..73a92ff 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h@@ -325,6 +325,18 @@ static inline int ipv6_addr_src_scope(const struct in6_addr *addr) return __ipv6_addr_src_scope(__ipv6_addr_props(addr)); } +static inline bool __ipv6_addr_needs_scope_id(struct ipv6_addr_props props) +{ + return props.type & IPV6_ADDR_LINKLOCAL || + (props.type & IPV6_ADDR_MULTICAST && + __ipv6_addr_src_scope(props) <= IPV6_ADDR_SCOPE_LINKLOCAL); +} + +static inline __u32 ipv6_iface_scope_id(const struct in6_addr *addr, int iface) +{ + return __ipv6_addr_needs_scope_id(__ipv6_addr_props(addr)) ? iface : 0; +} + static inline int ipv6_addr_cmp(const struct in6_addr *a1, const struct in6_addr *a2) { return memcmp(a1, a2, sizeof(struct in6_addr));
--
1.8.1.2