diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-04-30 07:51:08 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-04-30 07:51:08 +0000 |
| commit | 4c5e0f25d6a330dd984dac978f2e8612cf62cd8a (patch) | |
| tree | 378bd7a8f45b3fd4928c6932c02e2aea8cadc0c2 /sys/dev/pci/if_oce.c | |
| parent | a3e6a0f9b6b6da7f08adf24e9add7ed449dc5000 (diff) | |
Convert moar drivers to if_input().
ok dlg@
Diffstat (limited to 'sys/dev/pci/if_oce.c')
| -rw-r--r-- | sys/dev/pci/if_oce.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sys/dev/pci/if_oce.c b/sys/dev/pci/if_oce.c index 6e6f7937534..b77aebb23c8 100644 --- a/sys/dev/pci/if_oce.c +++ b/sys/dev/pci/if_oce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_oce.c,v 1.82 2015/03/14 03:38:48 jsg Exp $ */ +/* $OpenBSD: if_oce.c,v 1.83 2015/04/30 07:51:07 mpi Exp $ */ /* * Copyright (c) 2012 Mike Belopuhov @@ -1547,6 +1547,7 @@ oce_rxeof(struct oce_rq *rq, struct oce_nic_rx_cqe *cqe) struct oce_softc *sc = rq->sc; struct oce_pkt *pkt = NULL; struct ifnet *ifp = &sc->sc_ac.ac_if; + struct mbuf_list ml = MBUF_LIST_INITIALIZER(); struct mbuf *m = NULL, *tail = NULL; int i, len, frag_len; uint16_t vtag; @@ -1606,8 +1607,6 @@ oce_rxeof(struct oce_rq *rq, struct oce_nic_rx_cqe *cqe) goto exit; } - m->m_pkthdr.rcvif = ifp; - #if NVLAN > 0 /* This determines if vlan tag is valid */ if (oce_vtp_valid(sc, cqe)) { @@ -1645,15 +1644,10 @@ oce_rxeof(struct oce_rq *rq, struct oce_nic_rx_cqe *cqe) } #endif -#if NBPFILTER > 0 - if (ifp->if_bpf) - bpf_mtap_ether(ifp->if_bpf, m, BPF_DIRECTION_IN); -#endif - - ether_input_mbuf(ifp, m); + ml_enqueue(&ml, m); } exit: - return; + if_input(ifp, &ml); } void |