From 02eba1945425c978f7b364aab5173622b4ecab15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?= =?UTF-8?q?=E6=98=8E?= Date: Mon, 29 Mar 2010 06:00:05 +0000 Subject: [PATCH] --- yaml --- r: 193893 b: refs/heads/master c: d57b8fb8a8f94bdf467a4435be7d8bbebf87fe2a h: refs/heads/master i: 193891: 41f7cbe61a9811a214b1b98ebe1884f7c25f743c v: v3 --- [refs] | 2 +- trunk/include/net/ipv6.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9d822c13a660..5591ffb7844f 100644 --- 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 index e72fb10ce573..033ddd4652a5 100644 --- 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)); } /*