Date: Thu, 10 Sep 2015 06:10:31 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287609 - head/sys/netinet6 Message-ID: <201509100610.t8A6AVIl019717@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Thu Sep 10 06:10:30 2015 New Revision: 287609 URL: https://svnweb.freebsd.org/changeset/base/287609 Log: Do not add IN6_IFF_TENTATIVE when ND6_IFF_NO_DAD. MFC after: 3 days Modified: head/sys/netinet6/in6.c Modified: head/sys/netinet6/in6.c ============================================================================== --- head/sys/netinet6/in6.c Thu Sep 10 06:08:42 2015 (r287608) +++ head/sys/netinet6/in6.c Thu Sep 10 06:10:30 2015 (r287609) @@ -1198,11 +1198,13 @@ in6_update_ifa_internal(struct ifnet *if * 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; /* notify other subsystems */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509100610.t8A6AVIl019717>