Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
This commit is contained in:
commit
3bf395994d
|
@ -2467,9 +2467,11 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (idev->if_flags & IF_READY)
|
if (idev->if_flags & IF_READY) {
|
||||||
addrconf_dad_kick(ifp);
|
addrconf_dad_kick(ifp);
|
||||||
else {
|
spin_unlock_bh(&ifp->lock);
|
||||||
|
} else {
|
||||||
|
spin_unlock_bh(&ifp->lock);
|
||||||
/*
|
/*
|
||||||
* If the defice is not ready:
|
* If the defice is not ready:
|
||||||
* - keep it tentative if it is a permanent address.
|
* - keep it tentative if it is a permanent address.
|
||||||
|
@ -2478,8 +2480,6 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
|
||||||
in6_ifa_hold(ifp);
|
in6_ifa_hold(ifp);
|
||||||
addrconf_dad_stop(ifp);
|
addrconf_dad_stop(ifp);
|
||||||
}
|
}
|
||||||
|
|
||||||
spin_unlock_bh(&ifp->lock);
|
|
||||||
out:
|
out:
|
||||||
read_unlock_bh(&idev->lock);
|
read_unlock_bh(&idev->lock);
|
||||||
}
|
}
|
||||||
|
@ -2782,6 +2782,9 @@ restart:
|
||||||
in6_ifa_hold(ifpub);
|
in6_ifa_hold(ifpub);
|
||||||
spin_unlock(&ifp->lock);
|
spin_unlock(&ifp->lock);
|
||||||
read_unlock(&addrconf_hash_lock);
|
read_unlock(&addrconf_hash_lock);
|
||||||
|
spin_lock(&ifpub->lock);
|
||||||
|
ifpub->regen_count = 0;
|
||||||
|
spin_unlock(&ifpub->lock);
|
||||||
ipv6_create_tempaddr(ifpub, ifp);
|
ipv6_create_tempaddr(ifpub, ifp);
|
||||||
in6_ifa_put(ifpub);
|
in6_ifa_put(ifpub);
|
||||||
in6_ifa_put(ifp);
|
in6_ifa_put(ifp);
|
||||||
|
|
Loading…
Reference in a new issue