---

yaml --- r: 15337 b: refs/heads/master c: 6732bad h: refs/heads/master i: 15335: b80ba40 v: v3
git-mirror · Dec 27, 2005 · 88e2443 · 88e2443
1 parent 2cb1cbd
commit 88e2443
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79cac2a221ce18642550a13bed0f0203514923ea
+refs/heads/master: 6732badee0dad467fcc9dd0168af8677b2b1bc2f
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
@@ -2467,19 +2467,20 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
 		return;
 	}
 
-	if (idev->if_flags & IF_READY) {
-		addrconf_dad_kick(ifp);
-		spin_unlock_bh(&ifp->lock);
-	} else {
+	if (!(idev->if_flags & IF_READY)) {
 		spin_unlock_bh(&ifp->lock);
+		read_unlock_bh(&idev->lock);
 		/*
 		 * If the defice is not ready:
 		 * - keep it tentative if it is a permanent address.
 		 * - otherwise, kill it.
 		 */
 		in6_ifa_hold(ifp);
 		addrconf_dad_stop(ifp);
+		return;
 	}
+	addrconf_dad_kick(ifp);
+	spin_unlock_bh(&ifp->lock);
 out:
 	read_unlock_bh(&idev->lock);
 }