Convert to if_input().

ok pelikan@, reyk@, blambert@, henning@

2 files changed, 4 insertions, 18 deletions

diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index e97c235b792..fae8f1f33d2 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gem.c,v 1.108 2014/12/22 02:28:51 tedu Exp $	*/
+/*	$OpenBSD: gem.c,v 1.109 2015/02/08 06:02:03 mpi Exp $	*/
 /*	$NetBSD: gem.c,v 1.1 2001/09/16 00:11:43 eeh Exp $ */
 
 /*
@@ -998,16 +998,9 @@ gem_rint(struct gem_softc *sc)
 		m->m_data += 2; /* We're already off by two */
 
 		ifp->if_ipackets++;
-		m->m_pkthdr.rcvif = ifp;
 		m->m_pkthdr.len = m->m_len = len;
 
-#if NBPFILTER > 0
-		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);
 	}
 
 	/* Update the receive pointer. */
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;