svn commit: r346434 - in stable/12/sys: net netinet6

[Mark Johnston]

Author: markj
Date: Sat Apr 20 11:01:47 2019
New Revision: 346434
URL: https://svnweb.freebsd.org/changeset/base/346434

Log:
  MFC r345739:
  Do not perform DAD on stf(4) interfaces.

Modified:
  stable/12/sys/net/if_stf.c
  stable/12/sys/netinet6/in6.c
  stable/12/sys/netinet6/in6_ifattach.c
  stable/12/sys/netinet6/nd6.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/net/if_stf.c
==============================================================================
--- stable/12/sys/net/if_stf.c	Sat Apr 20 10:58:33 2019	(r346433)
+++ stable/12/sys/net/if_stf.c	Sat Apr 20 11:01:47 2019	(r346434)
@@ -724,6 +724,7 @@ stf_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		}
 
 		ifp->if_flags |= IFF_UP;
+		ifp->if_drv_flags |= IFF_DRV_RUNNING;
 		break;
 
 	case SIOCADDMULTI:

Modified: stable/12/sys/netinet6/in6.c
==============================================================================
--- stable/12/sys/netinet6/in6.c	Sat Apr 20 10:58:33 2019	(r346433)
+++ stable/12/sys/netinet6/in6.c	Sat Apr 20 11:01:47 2019	(r346434)
@@ -1943,26 +1943,14 @@ in6_if_up(struct ifnet *ifp)
 int
 in6if_do_dad(struct ifnet *ifp)
 {
+
 	if ((ifp->if_flags & IFF_LOOPBACK) != 0)
 		return (0);
-
-	if ((ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) ||
-	    (ND_IFINFO(ifp)->flags & ND6_IFF_NO_DAD))
+	if ((ifp->if_flags & IFF_MULTICAST) == 0)
 		return (0);
-
-	/*
-	 * Our DAD routine requires the interface up and running.
-	 * However, some interfaces can be up before the RUNNING
-	 * status.  Additionally, users may try to assign addresses
-	 * before the interface becomes up (or running).
-	 * This function returns EAGAIN in that case.
-	 * The caller should mark "tentative" on the address instead of
-	 * performing DAD immediately.
-	 */
-	if (!((ifp->if_flags & IFF_UP) &&
-	    (ifp->if_drv_flags & IFF_DRV_RUNNING)))
-		return (EAGAIN);
-
+	if ((ND_IFINFO(ifp)->flags &
+	    (ND6_IFF_IFDISABLED | ND6_IFF_NO_DAD)) != 0)
+		return (0);
 	return (1);
 }
 

Modified: stable/12/sys/netinet6/in6_ifattach.c
==============================================================================
--- stable/12/sys/netinet6/in6_ifattach.c	Sat Apr 20 10:58:33 2019	(r346433)
+++ stable/12/sys/netinet6/in6_ifattach.c	Sat Apr 20 11:01:47 2019	(r346434)
@@ -690,6 +690,7 @@ in6_ifattach(struct ifnet *ifp, struct ifnet *altifp)
 		 * it is rather harmful to have one.
 		 */
 		ND_IFINFO(ifp)->flags &= ~ND6_IFF_AUTO_LINKLOCAL;
+		ND_IFINFO(ifp)->flags |= ND6_IFF_NO_DAD;
 		break;
 	default:
 		break;

Modified: stable/12/sys/netinet6/nd6.c
==============================================================================
--- stable/12/sys/netinet6/nd6.c	Sat Apr 20 10:58:33 2019	(r346433)
+++ stable/12/sys/netinet6/nd6.c	Sat Apr 20 11:01:47 2019	(r346434)
@@ -896,6 +896,7 @@ nd6_timer(void *arg)
 	struct nd_prhead prl;
 	struct nd_defrouter *dr, *ndr;
 	struct nd_prefix *pr, *npr;
+	struct ifnet *ifp;
 	struct in6_ifaddr *ia6, *nia6;
 	uint64_t genid;
 
@@ -992,14 +993,15 @@ nd6_timer(void *arg)
 			 * Check status of the interface.  If it is down,
 			 * mark the address as tentative for future DAD.
 			 */
-			if ((ia6->ia_ifp->if_flags & IFF_UP) == 0 ||
-			    (ia6->ia_ifp->if_drv_flags & IFF_DRV_RUNNING)
-				== 0 ||
-			    (ND_IFINFO(ia6->ia_ifp)->flags &
-				ND6_IFF_IFDISABLED) != 0) {
+			ifp = ia6->ia_ifp;
+			if ((ND_IFINFO(ifp)->flags & ND6_IFF_NO_DAD) == 0 &&
+			    ((ifp->if_flags & IFF_UP) == 0 ||
+			    (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 ||
+			    (ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) != 0)){
 				ia6->ia6_flags &= ~IN6_IFF_DUPLICATED;
 				ia6->ia6_flags |= IN6_IFF_TENTATIVE;
 			}
+
 			/*
 			 * A new RA might have made a deprecated address
 			 * preferred.