diff options
author | YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> | 2013-01-14 02:10:31 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-14 13:17:01 -0500 |
commit | 2ef973320349cd536b33427aed98512e532d4cc6 (patch) | |
tree | d5b073e42bc36490c891fffb111ab26e01943d8e /include/net/ipv6.h | |
parent | 5206c579da0f5b93c3ae17bd8010d8dbd9fcdbe9 (diff) |
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 'include/net/ipv6.h')
-rw-r--r-- | include/net/ipv6.h | 15 |
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, | |||
399 | #endif | 399 | #endif |
400 | } | 400 | } |
401 | 401 | ||
402 | static inline bool __ipv6_prefix_equal(const __be32 *a1, const __be32 *a2, | 402 | static inline bool ipv6_prefix_equal(const struct in6_addr *addr1, |
403 | unsigned int prefixlen) | 403 | const struct in6_addr *addr2, |
404 | unsigned int prefixlen) | ||
404 | { | 405 | { |
406 | const __be32 *a1 = addr1->s6_addr32; | ||
407 | const __be32 *a2 = addr2->s6_addr32; | ||
405 | unsigned int pdw, pbi; | 408 | unsigned int pdw, pbi; |
406 | 409 | ||
407 | /* check complete u32 in prefix */ | 410 | /* check complete u32 in prefix */ |
@@ -417,14 +420,6 @@ static inline bool __ipv6_prefix_equal(const __be32 *a1, const __be32 *a2, | |||
417 | return true; | 420 | return true; |
418 | } | 421 | } |
419 | 422 | ||
420 | static inline bool ipv6_prefix_equal(const struct in6_addr *a1, | ||
421 | const struct in6_addr *a2, | ||
422 | unsigned int prefixlen) | ||
423 | { | ||
424 | return __ipv6_prefix_equal(a1->s6_addr32, a2->s6_addr32, | ||
425 | prefixlen); | ||
426 | } | ||
427 | |||
428 | struct inet_frag_queue; | 423 | struct inet_frag_queue; |
429 | 424 | ||
430 | enum ip6_defrag_users { | 425 | enum ip6_defrag_users { |