Page MenuHomeFreeBSD
Files F115929011

D39267.diff
No OneTemporary
Actions

D39267.diff
View Options

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
@@ -2107,18 +2107,15 @@
static int
lagg_transmit_ethernet(struct ifnet *ifp, struct mbuf *m)
{
- struct epoch_tracker et;
struct lagg_softc *sc = (struct lagg_softc *)ifp->if_softc;
- int error;
+ NET_EPOCH_ASSERT();
#if defined(KERN_TLS) || defined(RATELIMIT)
if (m->m_pkthdr.csum_flags & CSUM_SND_TAG)
MPASS(m->m_pkthdr.snd_tag->ifp == ifp);
#endif
- NET_EPOCH_ENTER(et);
/* We need a Tx algorithm and at least one port */
if (sc->sc_proto == LAGG_PROTO_NONE || sc->sc_count == 0) {
- NET_EPOCH_EXIT(et);
m_freem(m);
if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
return (ENXIO);
@@ -2126,26 +2123,21 @@
ETHER_BPF_MTAP(ifp, m);
- error = lagg_proto_start(sc, m);
- NET_EPOCH_EXIT(et);
- return (error);
+ return (lagg_proto_start(sc, m));
}
static int
lagg_transmit_infiniband(struct ifnet *ifp, struct mbuf *m)
{
- struct epoch_tracker et;
struct lagg_softc *sc = (struct lagg_softc *)ifp->if_softc;
- int error;
+ NET_EPOCH_ASSERT();
#if defined(KERN_TLS) || defined(RATELIMIT)
if (m->m_pkthdr.csum_flags & CSUM_SND_TAG)
MPASS(m->m_pkthdr.snd_tag->ifp == ifp);
#endif
- NET_EPOCH_ENTER(et);
/* We need a Tx algorithm and at least one port */
if (sc->sc_proto == LAGG_PROTO_NONE || sc->sc_count == 0) {
- NET_EPOCH_EXIT(et);
m_freem(m);
if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
return (ENXIO);
@@ -2153,9 +2145,7 @@
infiniband_bpf_mtap(ifp, m);
- error = lagg_proto_start(sc, m);
- NET_EPOCH_EXIT(et);
- return (error);
+ return (lagg_proto_start(sc, m));
}
/*
@@ -2169,16 +2159,14 @@
static struct mbuf *
lagg_input_ethernet(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);
}
@@ -2198,7 +2186,6 @@
}
#endif /* DEV_NETMAP */
- NET_EPOCH_EXIT(et);
return (m);
}

File Metadata

Mime Type
text/plain
Expires
Thu, May 1, 1:10 PM (9 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17882057
Default Alt Text
D39267.diff (2 KB)

Event Timeline