D31889.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D31889.diff
View Options

	diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
	--- a/sys/kern/uipc_domain.c
	+++ b/sys/kern/uipc_domain.c
	@@ -516,6 +516,8 @@
	struct domain *dp;
	struct protosw *pr;

	+ NET_EPOCH_ASSERT();
	+
	for (dp = domains; dp; dp = dp->dom_next)
	for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
	if (pr->pr_ctlinput)
	diff --git a/sys/net/if.c b/sys/net/if.c
	--- a/sys/net/if.c
	+++ b/sys/net/if.c
	@@ -2195,14 +2195,17 @@
	if_unroute(struct ifnet *ifp, int flag, int fam)
	{
	struct ifaddr *ifa;
	+ struct epoch_tracker et;

	KASSERT(flag == IFF_UP, ("if_unroute: flag != IFF_UP"));

	ifp->if_flags &= ~flag;
	getmicrotime(&ifp->if_lastchange);
	+ NET_EPOCH_ENTER(et);
	CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link)
	if (fam == PF_UNSPEC \|\| (fam == ifa->ifa_addr->sa_family))
	pfctlinput(PRC_IFDOWN, ifa->ifa_addr);
	+ NET_EPOCH_EXIT(et);
	ifp->if_qflush(ifp);

	if (ifp->if_carp)
	@@ -2218,14 +2221,17 @@
	if_route(struct ifnet *ifp, int flag, int fam)
	{
	struct ifaddr *ifa;
	+ struct epoch_tracker et;

	KASSERT(flag == IFF_UP, ("if_route: flag != IFF_UP"));

	ifp->if_flags \|= flag;
	getmicrotime(&ifp->if_lastchange);
	+ NET_EPOCH_ENTER(et);
	CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link)
	if (fam == PF_UNSPEC \|\| (fam == ifa->ifa_addr->sa_family))
	pfctlinput(PRC_IFUP, ifa->ifa_addr);
	+ NET_EPOCH_EXIT(et);
	if (ifp->if_carp)
	(*carp_linkstate_p)(ifp);
	rt_ifmsg(ifp);