summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Cappuccio <chris@cvs.openbsd.org>2015-02-20 23:24:31 +0000
committerChris Cappuccio <chris@cvs.openbsd.org>2015-02-20 23:24:31 +0000
commit7af864ca270b3cc3163500bc4fb3aa34efd4cbdb (patch)
treeb8aae89ca1783f0e4d7cee4f3b39a105197abce3
parent4805dac88f075c3c3e06d644f911d236b3ac556d (diff)
Now that if_input() is a thing, use it
ok dlg@
-rw-r--r--sys/dev/pci/if_myx.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/sys/dev/pci/if_myx.c b/sys/dev/pci/if_myx.c
index e21414dcb10..c95a41310bf 100644
--- a/sys/dev/pci/if_myx.c
+++ b/sys/dev/pci/if_myx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_myx.c,v 1.74 2015/02/18 23:58:34 dlg Exp $ */
+/* $OpenBSD: if_myx.c,v 1.75 2015/02/20 23:24:30 chris Exp $ */
/*
* Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org>
@@ -1862,7 +1862,6 @@ myx_rxeof(struct myx_softc *sc)
m = mb->mb_m;
m->m_data += ETHER_ALIGN;
- m->m_pkthdr.rcvif = ifp;
m->m_pkthdr.len = m->m_len = len;
ml_enqueue(&ml, m);
@@ -1891,15 +1890,7 @@ myx_rxeof(struct myx_softc *sc)
ifp->if_ipackets += ml_len(&ml);
KERNEL_LOCK();
-#if NBPFILTER > 0
- if (ifp->if_bpf) {
- MBUF_LIST_FOREACH(&ml, m)
- bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_IN);
- }
-#endif
-
- while ((m = ml_dequeue(&ml)) != NULL)
- ether_input_mbuf(ifp, m);
+ if_input(ifp, &ml);
KERNEL_UNLOCK();
}