aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2005-12-23 14:23:21 -0500
committerDavid S. Miller <davem@davemloft.net>2005-12-23 14:23:21 -0500
commit3dd3bf83574e38578fc9741c0e23e4fa7f7ff96e (patch)
treefb9ccc01f478161d20b45040f28419b13ba5c07c /net/ipv6
parentc162eeaa21fde6c27112690f5bc0a461a9f1763e (diff)
[IPV6]: Fix dead lock.
We need to relesae ifp->lock before we call addrconf_dad_stop(), which will hold ifp->lock. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/addrconf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 510220f2ae8b..d805241e439c 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2467,9 +2467,11 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
2467 return; 2467 return;
2468 } 2468 }
2469 2469
2470 if (idev->if_flags & IF_READY) 2470 if (idev->if_flags & IF_READY) {
2471 addrconf_dad_kick(ifp); 2471 addrconf_dad_kick(ifp);
2472 else { 2472 spin_unlock_bh(&ifp->lock);
2473 } else {
2474 spin_unlock_bh(&ifp->lock);
2473 /* 2475 /*
2474 * If the defice is not ready: 2476 * If the defice is not ready:
2475 * - keep it tentative if it is a permanent address. 2477 * - keep it tentative if it is a permanent address.
@@ -2478,8 +2480,6 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
2478 in6_ifa_hold(ifp); 2480 in6_ifa_hold(ifp);
2479 addrconf_dad_stop(ifp); 2481 addrconf_dad_stop(ifp);
2480 } 2482 }
2481
2482 spin_unlock_bh(&ifp->lock);
2483out: 2483out:
2484 read_unlock_bh(&idev->lock); 2484 read_unlock_bh(&idev->lock);
2485} 2485}