---

yaml --- r: 351380 b: refs/heads/master c: 2ef9733 h: refs/heads/master v: v3
git-mirror · Jan 14, 2013 · 7cf5d8b · 7cf5d8b
1 parent 32847bb
commit 7cf5d8b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5206c579da0f5b93c3ae17bd8010d8dbd9fcdbe9
+refs/heads/master: 2ef973320349cd536b33427aed98512e532d4cc6
diff --git a/trunk/include/net/ipv6.h b/trunk/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 {