[IPV6]: Fix addrconf dead lock.

[karo-tx-linux.git] / net / ipv6 / addrconf.c

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index d805241e439cf960c5233e801db26412069e77d5..a60585fd85ad0207ff28d3345b6b53839a15a5b3 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2467,11 +2467,9 @@ 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.
@@ -2479,7 +2477,10 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
                 */
                in6_ifa_hold(ifp);
                addrconf_dad_stop(ifp);
+               return;
        }
+       addrconf_dad_kick(ifp);
+       spin_unlock_bh(&ifp->lock);
 out:
        read_unlock_bh(&idev->lock);
 }
@@ -2782,6 +2783,9 @@ restart:
                                                in6_ifa_hold(ifpub);
                                                spin_unlock(&ifp->lock);
                                                read_unlock(&addrconf_hash_lock);
+                                               spin_lock(&ifpub->lock);
+                                               ifpub->regen_count = 0;
+                                               spin_unlock(&ifpub->lock);
                                                ipv6_create_tempaddr(ifpub, ifp);
                                                in6_ifa_put(ifpub);
                                                in6_ifa_put(ifp);