From d1008d53fd8bb407f32365e0556252a9370902b9 Mon Sep 17 00:00:00 2001
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Tue, 19 Apr 2005 22:27:09 -0700
Subject: [PATCH] --- yaml --- r: 331 b: refs/heads/master c:
 fd92833a52b972aafacced959f4a3f7541936a9b h: refs/heads/master i:   329:
 77d23fa83a7fdce51e4fa5e50ba4a26bde1c64a7   327:
 ea633e0e86d888d9e669e0e957d02db98dc373f6 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/addrconf.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ec656f891337..b7aaa6ecce99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4d541106bc5d0a2134aaf9e8735eee3c70b0db2
+refs/heads/master: fd92833a52b972aafacced959f4a3f7541936a9b
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index 5ffde14ddc09..7196ac2f2d16 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/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);