svn commit: r287732 - stable/10/sys/netinet6

[Hiroki Sato]

Author: hrs
Date: Sun Sep 13 01:44:30 2015
New Revision: 287732
URL: https://svnweb.freebsd.org/changeset/base/287732

Log:
  MFC 287609:
  
  Do not add IN6_IFF_TENTATIVE when ND6_IFF_NO_DAD.

Modified:
  stable/10/sys/netinet6/in6.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet6/in6.c
==============================================================================
--- stable/10/sys/netinet6/in6.c	Sun Sep 13 01:39:37 2015	(r287731)
+++ stable/10/sys/netinet6/in6.c	Sun Sep 13 01:44:30 2015	(r287732)
@@ -1254,11 +1254,13 @@ in6_update_ifa(struct ifnet *ifp, struct
 	 * 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;
 
 	/*