aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/ipv6.h
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>2013-01-14 07:10:31 +0000
committerDavid S. Miller <davem@davemloft.net>2013-01-14 13:17:01 -0500
commit2ef973320349cd536b33427aed98512e532d4cc6 (patch)
treed5b073e42bc36490c891fffb111ab26e01943d8e /include/net/ipv6.h
parentipv6: 64bit version of ipv6_addr_set(). (diff)
downloadlinux-dev-2ef973320349cd536b33427aed98512e532d4cc6.tar.xz
linux-dev-2ef973320349cd536b33427aed98512e532d4cc6.zip
ipv6: Remove __ipv6_prefix_equal().
ipv6_prefix_equal() just casts its arguments and it is the only user of __ipv6_prefix_equal(). Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--include/net/ipv6.h15
1 files changed, 5 insertions, 10 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index fb7f7c645e15..fe95053d02ce 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -399,9 +399,12 @@ static inline bool ipv6_addr_equal(const struct in6_addr *a1,
#endif
}
-static inline bool __ipv6_prefix_equal(const __be32 *a1, const __be32 *a2,
- unsigned int prefixlen)
+static inline bool ipv6_prefix_equal(const struct in6_addr *addr1,
+ const struct in6_addr *addr2,
+ unsigned int prefixlen)
{
+ const __be32 *a1 = addr1->s6_addr32;
+ const __be32 *a2 = addr2->s6_addr32;
unsigned int pdw, pbi;
/* check complete u32 in prefix */
@@ -417,14 +420,6 @@ static inline bool __ipv6_prefix_equal(const __be32 *a1, const __be32 *a2,
return true;
}
-static inline bool ipv6_prefix_equal(const struct in6_addr *a1,
- const struct in6_addr *a2,
- unsigned int prefixlen)
-{
- return __ipv6_prefix_equal(a1->s6_addr32, a2->s6_addr32,
- prefixlen);
-}
-
struct inet_frag_queue;
enum ip6_defrag_users {