diff options
| author | christos <christos@NetBSD.org> | 2014-02-21 02:10:40 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2014-02-21 02:10:40 +0000 |
| commit | 2e0bd910b8e940534f76f144ef792c6e0cf0f12f (patch) | |
| tree | c4326f2fe4e6f8b473d69f179286717996cab6c2 /sys/dev | |
| parent | 0e2d41e0ec668a6d99329ba39bc0e27ca9898522 (diff) | |
PR/48606: Lloyd Parkes: Drivers not using ifp->if_input but using ether_input
directly.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_age.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_alc.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_ale.c | 6 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_malo_pcmcia.c | 6 |
4 files changed, 10 insertions, 12 deletions
diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c index b7c3e1c2f88..821d15b89a4 100644 --- a/sys/dev/pci/if_age.c +++ b/sys/dev/pci/if_age.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_age.c,v 1.42 2013/03/30 03:21:02 christos Exp $ */ +/* $NetBSD: if_age.c,v 1.43 2014/02/21 02:10:40 christos Exp $ */ /* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */ /*- @@ -31,7 +31,7 @@ /* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.42 2013/03/30 03:21:02 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.43 2014/02/21 02:10:40 christos Exp $"); #include "vlan.h" @@ -1506,7 +1506,7 @@ age_rxeof(struct age_softc *sc, struct rx_rdesc *rxrd) bpf_mtap(ifp, m); /* Pass it on. */ - ether_input(ifp, m); + (*ifp->if_input)(ifp, m); /* Reset mbuf chains. */ AGE_RXCHAIN_RESET(sc); diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c index ffa86870770..415bc3ed8e3 100644 --- a/sys/dev/pci/if_alc.c +++ b/sys/dev/pci/if_alc.c @@ -1989,10 +1989,8 @@ alc_rxeof(struct alc_softc *sc, struct rx_rdesc *rrd) bpf_mtap(ifp, m); - { /* Pass it on. */ - ether_input(ifp, m); - } + (*ifp->if_input)(ifp, m); } } /* Reset mbuf chains. */ diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c index aa24b9388f9..19676701676 100644 --- a/sys/dev/pci/if_ale.c +++ b/sys/dev/pci/if_ale.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ale.c,v 1.15 2013/03/30 03:21:03 christos Exp $ */ +/* $NetBSD: if_ale.c,v 1.16 2014/02/21 02:10:40 christos Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> @@ -32,7 +32,7 @@ /* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.15 2013/03/30 03:21:03 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.16 2014/02/21 02:10:40 christos Exp $"); #include "vlan.h" @@ -1549,7 +1549,7 @@ ale_rxeof(struct ale_softc *sc) bpf_mtap(ifp, m); /* Pass it to upper layer. */ - ether_input(ifp, m); + (*ifp->if_input)(ifp, m); ale_rx_update_page(sc, &rx_page, length, &prod); } diff --git a/sys/dev/pcmcia/if_malo_pcmcia.c b/sys/dev/pcmcia/if_malo_pcmcia.c index d50cf02e8b4..1604a422830 100644 --- a/sys/dev/pcmcia/if_malo_pcmcia.c +++ b/sys/dev/pcmcia/if_malo_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_malo_pcmcia.c,v 1.3 2014/01/28 12:18:56 martin Exp $ */ +/* $NetBSD: if_malo_pcmcia.c,v 1.4 2014/02/21 02:10:40 christos Exp $ */ /* $OpenBSD: if_malo.c,v 1.65 2009/03/29 21:53:53 sthen Exp $ */ /* @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.3 2014/01/28 12:18:56 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.4 2014/02/21 02:10:40 christos Exp $"); #ifdef _MODULE #include <sys/module.h> @@ -1013,7 +1013,7 @@ cmalo_rx(struct malo_softc *sc) /* push the frame up to the network stack if not in monitor mode */ if (ic->ic_opmode != IEEE80211_M_MONITOR) { - ether_input(ifp, m); + (*ifp->if_input)(ifp, m); ifp->if_ipackets++; } } |
