aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>2010-03-29 06:00:05 +0000
committerDavid S. Miller <davem@davemloft.net>2010-03-30 23:28:46 -0700
commitd57b8fb8a8f94bdf467a4435be7d8bbebf87fe2a (patch)
tree07aa8906cb5717cbc531e2adfefb2d72c32a7874
parente1000e: typo corrections (diff)
downloadlinux-dev-d57b8fb8a8f94bdf467a4435be7d8bbebf87fe2a.tar.xz
linux-dev-d57b8fb8a8f94bdf467a4435be7d8bbebf87fe2a.zip
ipv6: Use __fls() instead of fls() in __ipv6_addr_diff().
Because we have ensured that the argument is non-zero, it is better to use __fls() and generate better code. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/ipv6.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index e72fb10ce573..033ddd4652a5 100644
--- a/include/net/ipv6.h
+++ b/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));
}
/*