aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/addrconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r--net/ipv6/addrconf.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 510220f2ae8b..2a6439e3c91c 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}
@@ -2782,6 +2782,9 @@ restart:
2782 in6_ifa_hold(ifpub); 2782 in6_ifa_hold(ifpub);
2783 spin_unlock(&ifp->lock); 2783 spin_unlock(&ifp->lock);
2784 read_unlock(&addrconf_hash_lock); 2784 read_unlock(&addrconf_hash_lock);
2785 spin_lock(&ifpub->lock);
2786 ifpub->regen_count = 0;
2787 spin_unlock(&ifpub->lock);
2785 ipv6_create_tempaddr(ifpub, ifp); 2788 ipv6_create_tempaddr(ifpub, ifp);
2786 in6_ifa_put(ifpub); 2789 in6_ifa_put(ifpub);
2787 in6_ifa_put(ifp); 2790 in6_ifa_put(ifp);