diff options
| author | hrs <hrs@FreeBSD.org> | 2015-09-13 01:44:30 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2015-09-13 01:44:30 +0000 |
| commit | 2f4beaf9e87209b013fcbb56bdbcb4a47c545e23 (patch) | |
| tree | 2d1ef6b25718160afa249a7892ad6bca60e102c2 | |
| parent | ec83826da703a6937b4cbd1f8051562b5e3909ab (diff) | |
| download | FreeBSD-src-2f4beaf9e87209b013fcbb56bdbcb4a47c545e23.zip FreeBSD-src-2f4beaf9e87209b013fcbb56bdbcb4a47c545e23.tar.gz | |
MFC 287609:
Do not add IN6_IFF_TENTATIVE when ND6_IFF_NO_DAD.
| -rw-r--r-- | sys/netinet6/in6.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 4c94ba8..432b08a 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1254,11 +1254,13 @@ in6_update_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra, * source address. */ ia->ia6_flags &= ~IN6_IFF_DUPLICATED; /* safety */ - if (hostIsNew && in6if_do_dad(ifp)) - ia->ia6_flags |= IN6_IFF_TENTATIVE; - /* DAD should be performed after ND6_IFF_IFDISABLED is cleared. */ - if (ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) + /* + * DAD should be performed for an new address or addresses on + * an interface with ND6_IFF_IFDISABLED. + */ + if (in6if_do_dad(ifp) && + (hostIsNew || (ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED))) ia->ia6_flags |= IN6_IFF_TENTATIVE; /* |
