diff options
| author |   mpi <mpi@openbsd.org> | 2015-02-08 06:02:24 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2015-02-08 06:02:24 +0000 |
| commit | 25366b7efaf5e5ca70c043f671183782ff2cd783 (patch) | |
| tree | 3fbe15d2ed94ce2bc889e3c377a56e833537a688 | |
| parent | Convert to if_input(). (diff) | |
| download | wireguard-openbsd-25366b7efaf5e5ca70c043f671183782ff2cd783.tar.xz wireguard-openbsd-25366b7efaf5e5ca70c043f671183782ff2cd783.zip | |
Convert to if_input().
ok pelikan@, reyk@, blambert@, henning@
| -rw-r--r-- | sys/dev/pci/if_em.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index b2c0cc7b2fc..55daeb15e49 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.291 2015/01/28 22:33:02 brad Exp $ */ +/* $OpenBSD: if_em.c,v 1.292 2015/02/08 06:02:24 mpi Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -2960,7 +2960,6 @@ em_rxeof(struct em_softc *sc) ifp->if_ipackets++; m = sc->fmp; - m->m_pkthdr.rcvif = ifp; em_receive_checksum(sc, desc, m); #if NVLAN > 0 @@ -2970,14 +2969,8 @@ em_rxeof(struct em_softc *sc) m->m_flags |= M_VLANTAG; } #endif -#if NBPFILTER > 0 - if (ifp->if_bpf) { - bpf_mtap_ether(ifp->if_bpf, m, - BPF_DIRECTION_IN); - } -#endif - ether_input_mbuf(ifp, m); + if_input(ifp, m); sc->fmp = NULL; sc->lmp = NULL; |