svn commit: r343651 - stable/12/sys/netinet6

[Hans Petter Selasky]

Author: hselasky
Date: Fri Feb  1 09:18:44 2019
New Revision: 343651
URL: https://svnweb.freebsd.org/changeset/base/343651

Log:
  Build fix for missing NET_EPOCH_XXX() dependencies after r343650.
  This patch is to be reverted when the relevant changes are MFC'ed.
  This is a direct commit.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/12/sys/netinet6/in6_mcast.c
  stable/12/sys/netinet6/in6_var.h
  stable/12/sys/netinet6/mld6.c

Modified: stable/12/sys/netinet6/in6_mcast.c
==============================================================================
--- stable/12/sys/netinet6/in6_mcast.c	Fri Feb  1 09:08:19 2019	(r343650)
+++ stable/12/sys/netinet6/in6_mcast.c	Fri Feb  1 09:18:44 2019	(r343651)
@@ -420,9 +420,9 @@ in6_getmulti(struct ifnet *ifp, const struct in6_addr 
 	IN6_MULTI_LOCK_ASSERT();
 	IN6_MULTI_LIST_LOCK();
 	IF_ADDR_WLOCK(ifp);
-	NET_EPOCH_ENTER(et);
+	NET_EPOCH_ENTER_ET(et);
 	inm = in6m_lookup_locked(ifp, group);
-	NET_EPOCH_EXIT(et);
+	NET_EPOCH_EXIT_ET(et);
 
 	if (inm != NULL) {
 		/*

Modified: stable/12/sys/netinet6/in6_var.h
==============================================================================
--- stable/12/sys/netinet6/in6_var.h	Fri Feb  1 09:08:19 2019	(r343650)
+++ stable/12/sys/netinet6/in6_var.h	Fri Feb  1 09:18:44 2019	(r343651)
@@ -722,8 +722,6 @@ static __inline struct in6_multi *
 in6m_ifmultiaddr_get_inm(struct ifmultiaddr *ifma)
 {
 
-	NET_EPOCH_ASSERT();
-
 	return ((ifma->ifma_addr->sa_family != AF_INET6 ||	
 	    (ifma->ifma_flags & IFMA_F_ENQUEUED) == 0) ? NULL :
 	    ifma->ifma_protospec);

Modified: stable/12/sys/netinet6/mld6.c
==============================================================================
--- stable/12/sys/netinet6/mld6.c	Fri Feb  1 09:08:19 2019	(r343650)
+++ stable/12/sys/netinet6/mld6.c	Fri Feb  1 09:18:44 2019	(r343651)
@@ -556,7 +556,7 @@ mld_ifdetach(struct ifnet *ifp, struct in6_multi_head 
 	 * Extract list of in6_multi associated with the detaching ifp
 	 * which the PF_INET6 layer is about to release.
 	 */
-	NET_EPOCH_ENTER(et);
+	NET_EPOCH_ENTER_ET(et);
 	CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		inm = in6m_ifmultiaddr_get_inm(ifma);
 		if (inm == NULL)
@@ -576,7 +576,7 @@ mld_ifdetach(struct ifnet *ifp, struct in6_multi_head 
 			}
 		}
 	}
-	NET_EPOCH_EXIT(et);
+	NET_EPOCH_EXIT_ET(et);
 	IF_ADDR_WUNLOCK(ifp);
 	MLD_UNLOCK();
 }
@@ -1411,7 +1411,7 @@ mld_fasttimo_vnet(struct in6_multi_head *inmh)
 		}
 
 		IF_ADDR_WLOCK(ifp);
-		NET_EPOCH_ENTER(et);
+		NET_EPOCH_ENTER_ET(et);
 		CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 			inm = in6m_ifmultiaddr_get_inm(ifma);
 			if (inm == NULL)
@@ -1449,7 +1449,7 @@ mld_fasttimo_vnet(struct in6_multi_head *inmh)
 			mld_dispatch_queue(&scq, 0);
 			break;
 		}
-		NET_EPOCH_EXIT(et);
+		NET_EPOCH_EXIT_ET(et);
 	}
 
 out_locked:
@@ -1685,7 +1685,7 @@ mld_v2_cancel_link_timers(struct mld_ifsoftc *mli)
 	ifp = mli->mli_ifp;
 
 	IF_ADDR_WLOCK(ifp);
-	NET_EPOCH_ENTER(et);
+	NET_EPOCH_ENTER_ET(et);
 	CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		inm = in6m_ifmultiaddr_get_inm(ifma);
 		if (inm == NULL)
@@ -1721,7 +1721,7 @@ mld_v2_cancel_link_timers(struct mld_ifsoftc *mli)
 			break;
 		}
 	}
-	NET_EPOCH_EXIT(et);
+	NET_EPOCH_EXIT_ET(et);
 	IF_ADDR_WUNLOCK(ifp);
 	in6m_release_list_deferred(&inmh);
 }