---

yaml --- r: 193893 b: refs/heads/master c: d57b8fb h: refs/heads/master i: 193891: 41f7cbe v: v3
git-mirror · Mar 31, 2010 · 02eba19 · 02eba19
1 parent 0c34886
commit 02eba19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c73e1fe94b1962ae5df7618519c18526e9d9072
+refs/heads/master: d57b8fb8a8f94bdf467a4435be7d8bbebf87fe2a
diff --git a/trunk/include/net/ipv6.h b/trunk/include/net/ipv6.h
@@ -422,7 +422,7 @@ static inline int __ipv6_addr_diff(const void *token1, const void *token2, int a
 	for (i = 0; i < addrlen; i++) {
 		__be32 xb = a1[i] ^ a2[i];
 		if (xb)
-			return i * 32 + 32 - fls(ntohl(xb));
+			return i * 32 + 31 - __fls(ntohl(xb));
 	}
 
 	/*