]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ipv6: Remove __ipv6_prefix_equal().
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>
Mon, 14 Jan 2013 07:10:31 +0000 (07:10 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Jan 2013 18:17:01 +0000 (13:17 -0500)
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>
include/net/ipv6.h

index fb7f7c645e158042bd03f0b16e34b78f4c558d52..fe95053d02ceed7747b2a80ed9b3280bc25f98e0 100644 (file)
@@ -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 {