From: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>
Date: Mon, 29 Mar 2010 06:00:05 +0000 (+0000)
Subject: ipv6: Use __fls() instead of fls() in __ipv6_addr_diff().
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~7341^2~643
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d57b8fb8a8f94bdf467a4435be7d8bbebf87fe2a;p=mirror_ubuntu-zesty-kernel.git

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>
---

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));
 	}
 
 	/*