diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-04-10 16:04:48 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-04-10 16:04:48 +0000 |
| commit | 1b26d55b720c4d36560a76c81aa9a37c130278fb (patch) | |
| tree | b229e1d62616a10720f6086295727e8d0f2f804b /sys/dev | |
| parent | 38f4305616fe45048902f184c5dddef2a5023d3c (diff) | |
Convert to if_input().
Tested by Daniel Jakots, thanks!
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_jme.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c index 9d90d4b1f05..e75a0503da7 100644 --- a/sys/dev/pci/if_jme.c +++ b/sys/dev/pci/if_jme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_jme.c,v 1.38 2015/03/14 03:38:48 jsg Exp $ */ +/* $OpenBSD: if_jme.c,v 1.39 2015/04/10 16:04:47 mpi Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -1615,6 +1615,7 @@ jme_rxpkt(struct jme_softc *sc) struct ifnet *ifp = &sc->sc_arpcom.ac_if; struct jme_desc *desc; struct jme_rxdesc *rxd; + struct mbuf_list ml = MBUF_LIST_INITIALIZER(); struct mbuf *mp, *m; uint32_t flags, status; int cons, count, nsegs; @@ -1726,21 +1727,17 @@ jme_rxpkt(struct jme_softc *sc) } #endif -#if NBPFILTER > 0 - if (ifp->if_bpf) - bpf_mtap_ether(ifp->if_bpf, m, - BPF_DIRECTION_IN); -#endif - ifp->if_ipackets++; - /* Pass it on. */ - ether_input_mbuf(ifp, m); + + ml_enqueue(&ml, m); /* Reset mbuf chains. */ JME_RXCHAIN_RESET(sc); } } + if_input(ifp, &ml); + sc->jme_cdata.jme_rx_cons += nsegs; sc->jme_cdata.jme_rx_cons %= JME_RX_RING_CNT; } |