From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Wed, 20 Apr 2005 05:27:09 +0000 (-0700)
Subject: [IPV6]: Fix a branch prediction
X-Git-Tag: v2.6.12-rc3~9
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fd92833a52b972aafacced959f4a3f7541936a9b;p=~emulex%2Finfiniband.git

[IPV6]: Fix a branch prediction

From: Tushar Gohad <tgohad@mvista.com>

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 5ffde14ddc0..7196ac2f2d1 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -571,7 +571,7 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, int pfxlen,
 out2:
 	read_unlock_bh(&addrconf_lock);
 
-	if (unlikely(err == 0))
+	if (likely(err == 0))
 		notifier_call_chain(&inet6addr_chain, NETDEV_UP, ifa);
 	else {
 		kfree(ifa);