diff options
| author |   jasper <jasper@openbsd.org> | 2015-03-13 15:58:22 +0000 |
|---|---|---|
| committer | jasper <jasper@openbsd.org> | 2015-03-13 15:58:22 +0000 |
| commit | 98ce9610c5f53c1c058e3b6c7595bfd5ee4b83fd (patch) | |
| tree | bb1201bcd5d2379315cda1a0e99e7910e605de73 | |
| parent | convert to if_input() (diff) | |
| download | wireguard-openbsd-98ce9610c5f53c1c058e3b6c7595bfd5ee4b83fd.tar.xz wireguard-openbsd-98ce9610c5f53c1c058e3b6c7595bfd5ee4b83fd.zip | |
convert to if_input()
ok mpi@ sthen@
| -rw-r--r-- | sys/dev/pci/if_vr.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index 81189c83fe1..a4a7d2bfdfe 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.137 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_vr.c,v 1.138 2015/03/13 15:58:22 jasper Exp $ */ /* * Copyright (c) 1997, 1998 @@ -826,6 +826,7 @@ void vr_rxeof(struct vr_softc *sc) { struct mbuf *m; + struct mbuf_list ml = MBUF_LIST_INITIALIZER(); struct ifnet *ifp; struct vr_chain_onefrag *cur_rx; int total_len = 0; @@ -908,7 +909,6 @@ vr_rxeof(struct vr_softc *sc) m = m0; } #else - m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = total_len; #endif @@ -941,15 +941,7 @@ vr_rxeof(struct vr_softc *sc) } #endif -#if NBPFILTER > 0 - /* - * Handle BPF listeners. Let the BPF user see the packet. - */ - if (ifp->if_bpf) - bpf_mtap_ether(ifp->if_bpf, m, BPF_DIRECTION_IN); -#endif - /* pass it on. */ - ether_input_mbuf(ifp, m); + ml_enqueue(&ml, m); } vr_fill_rx_ring(sc); @@ -957,6 +949,8 @@ vr_rxeof(struct vr_softc *sc) bus_dmamap_sync(sc->sc_dmat, sc->sc_listmap.vrm_map, 0, sc->sc_listmap.vrm_map->dm_mapsize, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + + if_input(ifp, &ml); } void |