Module Name: src
Committed By: christos
Date: Fri Feb 21 02:10:40 UTC 2014
Modified Files:
src/sys/dev/pci: if_age.c if_alc.c if_ale.c
src/sys/dev/pcmcia: if_malo_pcmcia.c
src/sys/rump/net/lib/libvirtif: if_virt.c
Log Message:
PR/48606: Lloyd Parkes: Drivers not using ifp->if_input but using ether_input
directly.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/if_age.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/if_alc.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/if_ale.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pcmcia/if_malo_pcmcia.c
cvs rdiff -u -r1.36 -r1.37 src/sys/rump/net/lib/libvirtif/if_virt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_age.c
diff -u src/sys/dev/pci/if_age.c:1.42 src/sys/dev/pci/if_age.c:1.43
--- src/sys/dev/pci/if_age.c:1.42 Fri Mar 29 23:21:02 2013
+++ src/sys/dev/pci/if_age.c Thu Feb 20 21:10:40 2014
@@ -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 r
bpf_mtap(ifp, m);
/* Pass it on. */
- ether_input(ifp, m);
+ (*ifp->if_input)(ifp, m);
/* Reset mbuf chains. */
AGE_RXCHAIN_RESET(sc);
Index: src/sys/dev/pci/if_alc.c
diff -u src/sys/dev/pci/if_alc.c:1.9 src/sys/dev/pci/if_alc.c:1.10
--- src/sys/dev/pci/if_alc.c:1.9 Sun Apr 21 15:59:40 2013
+++ src/sys/dev/pci/if_alc.c Thu Feb 20 21:10:40 2014
@@ -1989,10 +1989,8 @@ alc_rxeof(struct alc_softc *sc, struct r
bpf_mtap(ifp, m);
- {
/* Pass it on. */
- ether_input(ifp, m);
- }
+ (*ifp->if_input)(ifp, m);
}
}
/* Reset mbuf chains. */
Index: src/sys/dev/pci/if_ale.c
diff -u src/sys/dev/pci/if_ale.c:1.15 src/sys/dev/pci/if_ale.c:1.16
--- src/sys/dev/pci/if_ale.c:1.15 Fri Mar 29 23:21:03 2013
+++ src/sys/dev/pci/if_ale.c Thu Feb 20 21:10:40 2014
@@ -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 <[email protected]>
@@ -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);
}
Index: src/sys/dev/pcmcia/if_malo_pcmcia.c
diff -u src/sys/dev/pcmcia/if_malo_pcmcia.c:1.3 src/sys/dev/pcmcia/if_malo_pcmcia.c:1.4
--- src/sys/dev/pcmcia/if_malo_pcmcia.c:1.3 Tue Jan 28 07:18:56 2014
+++ src/sys/dev/pcmcia/if_malo_pcmcia.c Thu Feb 20 21:10:40 2014
@@ -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++;
}
}
Index: src/sys/rump/net/lib/libvirtif/if_virt.c
diff -u src/sys/rump/net/lib/libvirtif/if_virt.c:1.36 src/sys/rump/net/lib/libvirtif/if_virt.c:1.37
--- src/sys/rump/net/lib/libvirtif/if_virt.c:1.36 Thu Jul 4 07:46:51 2013
+++ src/sys/rump/net/lib/libvirtif/if_virt.c Thu Feb 20 21:10:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_virt.c,v 1.36 2013/07/04 11:46:51 pooka Exp $ */
+/* $NetBSD: if_virt.c,v 1.37 2014/02/21 02:10:40 christos Exp $ */
/*
* Copyright (c) 2008, 2013 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_virt.c,v 1.36 2013/07/04 11:46:51 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_virt.c,v 1.37 2014/02/21 02:10:40 christos Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -278,7 +278,7 @@ virtif_receiver(void *arg)
m->m_len = m->m_pkthdr.len = n;
m->m_pkthdr.rcvif = ifp;
bpf_mtap(ifp, m);
- ether_input(ifp, m);
+ (*ipf->if_input)(ifp, m);
}
kthread_exit(0);
