summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2016-01-08 13:47:23 +0100
committerDavid S. Miller <davem@davemloft.net>2016-01-10 22:54:27 -0500
commit3d171f3907329d4b1ce31d5ec9c852c5f0269578 (patch)
tree51e486c1872310340fc109c6c9423b554e3bd2a5 /net
parent541b8e291f29e480fb9c6400ce796c2eaefe9229 (diff)
downloadlinux-3d171f3907329d4b1ce31d5ec9c852c5f0269578.tar.bz2
ipv6: always add flag an address that failed DAD with DADFAILED
The userspace needs to know why is the address being removed so that it can perhaps obtain a new address. Without the DADFAILED flag it's impossible to distinguish removal of a temporary and tentative address due to DAD failure from other reasons (device removed, manual address removal). Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/addrconf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 8697551b16a8..38eeddedfc21 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1772,12 +1772,13 @@ struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, const struct in6_addr *add
static void addrconf_dad_stop(struct inet6_ifaddr *ifp, int dad_failed)
{
+ if (dad_failed)
+ ifp->flags |= IFA_F_DADFAILED;
+
if (ifp->flags&IFA_F_PERMANENT) {
spin_lock_bh(&ifp->lock);
addrconf_del_dad_work(ifp);
ifp->flags |= IFA_F_TENTATIVE;
- if (dad_failed)
- ifp->flags |= IFA_F_DADFAILED;
spin_unlock_bh(&ifp->lock);
if (dad_failed)
ipv6_ifa_notify(0, ifp);