[src/trunk]: src/sys PR/48606: Lloyd Parkes: Drivers not using ifp->if_input ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/229165638380
branches:  trunk
changeset: 793614:229165638380
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Feb 21 02:10:40 2014 +0000

description:
PR/48606: Lloyd Parkes: Drivers not using ifp->if_input but using ether_input
directly.

diffstat:

 sys/dev/pci/if_age.c                 |  6 +++---
 sys/dev/pci/if_alc.c                 |  4 +---
 sys/dev/pci/if_ale.c                 |  6 +++---
 sys/dev/pcmcia/if_malo_pcmcia.c      |  6 +++---
 sys/rump/net/lib/libvirtif/if_virt.c |  6 +++---
 5 files changed, 13 insertions(+), 15 deletions(-)

diffs (123 lines):

diff -r bf8a18f392d8 -r 229165638380 sys/dev/pci/if_age.c
--- a/sys/dev/pci/if_age.c      Fri Feb 21 01:55:10 2014 +0000
+++ b/sys/dev/pci/if_age.c      Fri Feb 21 02:10:40 2014 +0000
@@ -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 @@
 
                        bpf_mtap(ifp, m);
                        /* Pass it on. */
-                       ether_input(ifp, m);
+                       (*ifp->if_input)(ifp, m);
 
                        /* Reset mbuf chains. */
                        AGE_RXCHAIN_RESET(sc);
diff -r bf8a18f392d8 -r 229165638380 sys/dev/pci/if_alc.c
--- a/sys/dev/pci/if_alc.c      Fri Feb 21 01:55:10 2014 +0000
+++ b/sys/dev/pci/if_alc.c      Fri Feb 21 02:10:40 2014 +0000
@@ -1989,10 +1989,8 @@
 
                        bpf_mtap(ifp, m);
 
-                       {
                        /* Pass it on. */
-                       ether_input(ifp, m);
-                       }
+                       (*ifp->if_input)(ifp, m);
                }
        }
        /* Reset mbuf chains. */
diff -r bf8a18f392d8 -r 229165638380 sys/dev/pci/if_ale.c
--- a/sys/dev/pci/if_ale.c      Fri Feb 21 01:55:10 2014 +0000
+++ b/sys/dev/pci/if_ale.c      Fri Feb 21 02:10:40 2014 +0000
@@ -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@localhost>
@@ -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 @@
                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 -r bf8a18f392d8 -r 229165638380 sys/dev/pcmcia/if_malo_pcmcia.c
--- a/sys/dev/pcmcia/if_malo_pcmcia.c   Fri Feb 21 01:55:10 2014 +0000
+++ b/sys/dev/pcmcia/if_malo_pcmcia.c   Fri Feb 21 02:10:40 2014 +0000
@@ -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 @@
 
        /* 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++;
        }
 }
diff -r bf8a18f392d8 -r 229165638380 sys/rump/net/lib/libvirtif/if_virt.c
--- a/sys/rump/net/lib/libvirtif/if_virt.c      Fri Feb 21 01:55:10 2014 +0000
+++ b/sys/rump/net/lib/libvirtif/if_virt.c      Fri Feb 21 02:10:40 2014 +0000
@@ -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 @@
                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);