Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 510220f..2a6439e 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2467,9 +2467,11 @@
return;
}
- if (idev->if_flags & IF_READY)
+ if (idev->if_flags & IF_READY) {
addrconf_dad_kick(ifp);
- else {
+ spin_unlock_bh(&ifp->lock);
+ } else {
+ spin_unlock_bh(&ifp->lock);
/*
* If the defice is not ready:
* - keep it tentative if it is a permanent address.
@@ -2478,8 +2480,6 @@
in6_ifa_hold(ifp);
addrconf_dad_stop(ifp);
}
-
- spin_unlock_bh(&ifp->lock);
out:
read_unlock_bh(&idev->lock);
}
@@ -2782,6 +2782,9 @@
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);