diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-02-08 06:55:29 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-02-08 06:55:29 +0000 |
| commit | 7e37bdaf89d6a47839ba63c1585fe60eaa370a20 (patch) | |
| tree | c60fba3d9e1688c2ecbdf54beafcd706d9ea0594 /sys | |
| parent | 29861f9d6f3cf157a67389074bc91cb6423ded20 (diff) | |
Convert to if_input().
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/re.c | 9 | ||||
| -rw-r--r-- | sys/dev/pci/if_pcn.c | 12 |
2 files changed, 4 insertions, 17 deletions
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c index 3d207a9b0f2..d82b8322fac 100644 --- a/sys/dev/ic/re.c +++ b/sys/dev/ic/re.c @@ -1,4 +1,4 @@ -/* $OpenBSD: re.c,v 1.173 2015/01/21 10:00:42 brad Exp $ */ +/* $OpenBSD: re.c,v 1.174 2015/02/08 06:55:28 mpi Exp $ */ /* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -1382,7 +1382,6 @@ re_rxeof(struct rl_softc *sc) (total_len - ETHER_CRC_LEN); ifp->if_ipackets++; - m->m_pkthdr.rcvif = ifp; /* Do RX checksumming */ @@ -1422,11 +1421,7 @@ re_rxeof(struct rl_softc *sc) } #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->rl_ldata.rl_rx_considx = i; diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c index af8dbe6bed2..e1a7151977d 100644 --- a/sys/dev/pci/if_pcn.c +++ b/sys/dev/pci/if_pcn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pcn.c,v 1.33 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_pcn.c,v 1.34 2015/02/08 06:55:28 mpi Exp $ */ /* $NetBSD: if_pcn.c,v 1.26 2005/05/07 09:15:44 is Exp $ */ /* @@ -1410,17 +1410,9 @@ pcn_rxintr(struct pcn_softc *sc) } } - m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = len; -#if NBPFILTER > 0 - /* Pass this up to any BPF listeners. */ - if (ifp->if_bpf) - bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_IN); -#endif /* NBPFILTER > 0 */ - - /* Pass it on. */ - ether_input_mbuf(ifp, m); + if_input(ifp, m); ifp->if_ipackets++; } |