D39275.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D39275.diff
View Options

	diff --git a/sys/net/if_infiniband.c b/sys/net/if_infiniband.c
	--- a/sys/net/if_infiniband.c
	+++ b/sys/net/if_infiniband.c
	@@ -417,6 +417,7 @@
	int isr;

	CURVNET_SET_QUIET(ifp->if_vnet);
	+ NET_EPOCH_ENTER(et);

	if ((ifp->if_flags & IFF_UP) == 0) {
	if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
	@@ -504,10 +505,9 @@
	mac_ifnet_create_mbuf(ifp, m);
	#endif
	/* Allow monitor mode to claim this frame, after stats are updated. */
	- NET_EPOCH_ENTER(et);
	netisr_dispatch(isr, m);
	- NET_EPOCH_EXIT(et);
	done:
	+ NET_EPOCH_EXIT(et);
	CURVNET_RESTORE();
	}

	diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c
	--- a/sys/net/if_lagg.c
	+++ b/sys/net/if_lagg.c
	@@ -2192,16 +2192,14 @@
	static struct mbuf *
	lagg_input_infiniband(struct ifnet ifp, struct mbuf m)
	{
	- struct epoch_tracker et;
	struct lagg_port *lp = ifp->if_lagg;
	struct lagg_softc *sc = lp->lp_softc;
	struct ifnet *scifp = sc->sc_ifp;

	- NET_EPOCH_ENTER(et);
	+ NET_EPOCH_ASSERT();
	if ((scifp->if_drv_flags & IFF_DRV_RUNNING) == 0 \|\|
	lp->lp_detaching != 0 \|\|
	sc->sc_proto == LAGG_PROTO_NONE) {
	- NET_EPOCH_EXIT(et);
	m_freem(m);
	return (NULL);
	}
	@@ -2214,7 +2212,6 @@
	m = NULL;
	}

	- NET_EPOCH_EXIT(et);
	return (m);
	}