Patchwork [5/6] ipv6: Remove __ipv6_prefix_equal().

login
register
mail settings
Submitter YOSHIFUJI Hideaki / 吉藤英明
Date Jan. 14, 2013, 5:10 p.m.
Message ID <50F43C07.3080804@linux-ipv6.org>
Download mbox | patch
Permalink /patch/211846/
State Accepted
Delegated to: David Miller
Headers show

Comments

YOSHIFUJI Hideaki / 吉藤英明 - Jan. 14, 2013, 5:10 p.m.
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>
---
 include/net/ipv6.h |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

Patch

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index fb7f7c6..fe95053 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 {