From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 15 Nov 2006 04:56:33 +0000 (-0800)
Subject: [IPV6]: __ipv6_addr_diff() annotations and cleanup.
X-Git-Tag: v2.6.20-rc2~6^2~13^2~359
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ef296f56f8501f3ac68b8d44f63205f544126733;p=linux-2.6-omap-h63xx.git

[IPV6]: __ipv6_addr_diff() annotations and cleanup.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 4ca9e93decc..00328b71a08 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -394,22 +394,15 @@ static inline int ipv6_addr_any(const struct in6_addr *a)
  */
 static inline int __ipv6_addr_diff(const void *token1, const void *token2, int addrlen)
 {
-	const __u32 *a1 = token1, *a2 = token2;
+	const __be32 *a1 = token1, *a2 = token2;
 	int i;
 
 	addrlen >>= 2;
 
 	for (i = 0; i < addrlen; i++) {
-		__u32 xb = a1[i] ^ a2[i];
-		if (xb) {
-			int j = 31;
-
-			xb = ntohl(xb);
-			while ((xb & (1 << j)) == 0)
-				j--;
-
-			return (i * 32 + 31 - j);
-		}
+		__be32 xb = a1[i] ^ a2[i];
+		if (xb)
+			return i * 32 + 32 - fls(ntohl(xb));
 	}
 
 	/*