Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Move bpf_mtap and if_ipackets++ on Rx of each driver to ...



details:   https://anonhg.NetBSD.org/src/rev/d508101822b7
branches:  trunk
changeset: 819725:d508101822b7
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Thu Dec 15 09:28:02 2016 +0000

description:
Move bpf_mtap and if_ipackets++ on Rx of each driver to percpuq if_input

The benefits of the change are:
- We can reduce codes
- We can provide the same behavior between drivers
  - Where/When if_ipackets is counted up
  - Note that some drivers still update packet statistics in their own
    way (periodical update)
- Moved bpf_mtap run in softint
  - This makes it easy to MP-ify bpf

Proposed on tech-kern and tech-net

diffstat:

 sys/arch/acorn32/podulebus/if_ie.c       |   8 ++------
 sys/arch/amiga/dev/if_es.c               |   6 ++----
 sys/arch/amiga/dev/if_qn.c               |   9 ++-------
 sys/arch/arm/at91/at91emac.c             |   7 +++----
 sys/arch/arm/broadcom/bcm53xx_eth.c      |   4 +---
 sys/arch/arm/ep93xx/epe.c                |   5 ++---
 sys/arch/arm/gemini/gemini_gmac.c        |   6 ++----
 sys/arch/arm/gemini/if_gpn.c             |   6 ++----
 sys/arch/arm/imx/if_enet.c               |   8 ++------
 sys/arch/arm/omap/if_cpsw.c              |   8 ++------
 sys/arch/arm/omap/omapl1x_emac.c         |   5 +----
 sys/arch/arm/rockchip/rockchip_emac.c    |   6 ++----
 sys/arch/arm/xscale/ixp425_if_npe.c      |   7 +++----
 sys/arch/emips/ebus/if_le_ebus.c         |  13 ++-----------
 sys/arch/evbppc/virtex/dev/if_temac.c    |   7 ++-----
 sys/arch/mac68k/dev/if_mc.c              |   9 ++-------
 sys/arch/mac68k/nubus/if_netdock_nubus.c |   6 ++----
 sys/arch/macppc/dev/am79c950.c           |   9 ++-------
 sys/arch/macppc/dev/if_bm.c              |  10 ++--------
 sys/arch/macppc/dev/if_gm.c              |  10 ++--------
 sys/arch/mips/adm5120/dev/if_admsw.c     |   7 ++-----
 sys/arch/mips/alchemy/dev/if_aumac.c     |   8 ++------
 sys/arch/mips/atheros/dev/if_ae.c        |  11 ++---------
 sys/arch/mips/cavium/dev/if_cnmac.c      |  10 ++--------
 sys/arch/mips/ralink/ralink_eth.c        |  11 ++---------
 sys/arch/mips/sibyte/dev/sbmac.c         |   6 ++----
 sys/arch/newsmips/apbus/if_sn.c          |  10 +++-------
 sys/arch/next68k/dev/mb8795.c            |  11 ++---------
 sys/arch/playstation2/dev/if_smap.c      |  11 +++--------
 sys/arch/powerpc/booke/dev/pq3etsec.c    |   6 ++----
 sys/arch/powerpc/ibm4xx/dev/if_emac.c    |  11 ++---------
 sys/arch/sgimips/hpc/if_sq.c             |   7 ++-----
 sys/arch/sgimips/mace/if_mec.c           |  12 ++----------
 sys/arch/sun2/dev/if_ec.c                |  12 ++----------
 sys/arch/sun3/dev/if_ie.c                |   8 ++------
 sys/arch/usermode/dev/if_veth.c          |   7 ++-----
 sys/arch/x86/pci/if_vmx.c                |   6 ++----
 sys/arch/xen/xen/if_xennet_xenbus.c      |  10 ++--------
 sys/arch/xen/xen/xennetback_xenbus.c     |   6 ++----
 sys/dev/bi/if_ni.c                       |   5 ++---
 sys/dev/cadence/if_cemac.c               |   5 ++---
 sys/dev/ic/aic6915.c                     |   9 ++-------
 sys/dev/ic/cs89x0.c                      |  12 ++----------
 sys/dev/ic/dm9000.c                      |   5 +----
 sys/dev/ic/dp8390.c                      |  12 ++----------
 sys/dev/ic/dp83932.c                     |  10 ++--------
 sys/dev/ic/dwc_gmac.c                    |   6 ++----
 sys/dev/ic/elink3.c                      |  12 ++----------
 sys/dev/ic/elinkxl.c                     |   5 ++---
 sys/dev/ic/gem.c                         |  11 ++---------
 sys/dev/ic/hme.c                         |  12 ++----------
 sys/dev/ic/i82557.c                      |  10 ++--------
 sys/dev/ic/i82586.c                      |   7 ++-----
 sys/dev/ic/i82596.c                      |   6 ++----
 sys/dev/ic/lan9118.c                     |  11 ++---------
 sys/dev/ic/lance.c                       |  12 ++----------
 sys/dev/ic/lemac.c                       |   6 ++----
 sys/dev/ic/mb86950.c                     |  15 +++------------
 sys/dev/ic/mb86960.c                     |  13 ++-----------
 sys/dev/ic/mtd803.c                      |   7 ++-----
 sys/dev/ic/pdq_ifsubr.c                  |   7 ++-----
 sys/dev/ic/rrunner.c                     |  16 ++--------------
 sys/dev/ic/rtl8169.c                     |   6 ++----
 sys/dev/ic/rtl81x9.c                     |   7 ++-----
 sys/dev/ic/seeq8005.c                    |  11 ++---------
 sys/dev/ic/sgec.c                        |   6 ++----
 sys/dev/ic/smc83c170.c                   |  11 ++---------
 sys/dev/ic/smc90cx6.c                    |   7 ++-----
 sys/dev/ic/smc91cxx.c                    |  11 ++---------
 sys/dev/ic/tropic.c                      |   6 ++----
 sys/dev/ic/tulip.c                       |  11 ++---------
 sys/dev/if_ndis/if_ndis.c                |   9 +++------
 sys/dev/isa/if_eg.c                      |  12 ++----------
 sys/dev/isa/if_el.c                      |  12 ++----------
 sys/dev/isa/if_iy.c                      |   9 ++-------
 sys/dev/marvell/if_gfe.c                 |   7 ++-----
 sys/dev/marvell/if_mvgbe.c               |   8 ++------
 sys/dev/marvell/if_mvxpe.c               |   6 ++----
 sys/dev/ofw/ofnet.c                      |   6 ++----
 sys/dev/pci/if_age.c                     |   5 ++---
 sys/dev/pci/if_alc.c                     |   4 +---
 sys/dev/pci/if_ale.c                     |   7 ++-----
 sys/dev/pci/if_bce.c                     |  11 ++---------
 sys/dev/pci/if_bge.c                     |  10 ++--------
 sys/dev/pci/if_bnx.c                     |  12 +++---------
 sys/dev/pci/if_cas.c                     |  10 ++--------
 sys/dev/pci/if_de.c                      |   7 ++-----
 sys/dev/pci/if_dge.c                     |   9 ++-------
 sys/dev/pci/if_et.c                      |   7 ++-----
 sys/dev/pci/if_jme.c                     |   6 ++----
 sys/dev/pci/if_kse.c                     |   6 ++----
 sys/dev/pci/if_lii.c                     |   7 ++-----
 sys/dev/pci/if_msk.c                     |   8 ++------
 sys/dev/pci/if_nfe.c                     |   6 ++----
 sys/dev/pci/if_pcn.c                     |   8 ++------
 sys/dev/pci/if_sip.c                     |  18 ++----------------
 sys/dev/pci/if_sk.c                      |   7 ++-----
 sys/dev/pci/if_ste.c                     |  10 ++--------
 sys/dev/pci/if_stge.c                    |   5 ++---
 sys/dev/pci/if_ti.c                      |  13 ++-----------
 sys/dev/pci/if_tl.c                      |   5 ++---
 sys/dev/pci/if_txp.c                     |   9 ++-------
 sys/dev/pci/if_vge.c                     |  10 ++--------
 sys/dev/pci/if_vioif.c                   |   6 ++----
 sys/dev/pci/if_vr.c                      |  12 ++----------
 sys/dev/pci/if_vte.c                     |   6 ++----
 sys/dev/pci/if_wm.c                      |   9 ++-------
 sys/dev/pci/if_xge.c                     |   8 ++------
 sys/dev/pci/ixgbe/ix_txrx.c              |   4 +---
 sys/dev/pcmcia/if_cnw.c                  |   6 ++----
 sys/dev/pcmcia/if_malo_pcmcia.c          |  11 +++--------
 sys/dev/pcmcia/if_xi.c                   |   8 ++------
 sys/dev/qbus/if_de.c                     |   6 ++----
 sys/dev/qbus/if_qe.c                     |   5 ++---
 sys/dev/qbus/if_qt.c                     |   5 ++---
 sys/dev/sbus/be.c                        |  10 ++--------
 sys/dev/sbus/qe.c                        |  10 ++--------
 sys/dev/scsipi/if_se.c                   |  11 ++---------
 sys/dev/usb/if_aue.c                     |  13 ++-----------
 sys/dev/usb/if_axe.c                     |   7 ++-----
 sys/dev/usb/if_axen.c                    |   6 ++----
 sys/dev/usb/if_cdce.c                    |   7 ++-----
 sys/dev/usb/if_cue.c                     |  13 ++-----------
 sys/dev/usb/if_kue.c                     |  13 ++-----------
 sys/dev/usb/if_smsc.c                    |   4 +---
 sys/dev/usb/if_udav.c                    |   7 ++-----
 sys/dev/usb/if_upl.c                     |  13 ++-----------
 sys/dev/usb/if_url.c                     |   7 ++-----
 sys/dev/usb/if_urndis.c                  |   8 ++------
 sys/net/agr/if_agr.c                     |   6 ++----
 sys/net/if.c                             |  26 +++++++++++++++++++++++---
 sys/net/if_tap.c                         |   6 ++----
 sys/net/if_vlan.c                        |   6 ++----
 sys/net80211/ieee80211_input.c           |   9 ++-------
 sys/netinet/ip_etherip.c                 |   8 ++------
 sys/netinet6/ip6_etherip.c               |   8 ++------
 sys/netisdn/i4b_isppp.c                  |  19 ++-----------------
 sys/rump/net/lib/libshmif/if_shmem.c     |   6 ++----
 sys/rump/net/lib/libvirtif/if_virt.c     |   6 ++----
 139 files changed, 301 insertions(+), 892 deletions(-)

diffs (truncated from 4469 to 300 lines):

diff -r cf033c124c91 -r d508101822b7 sys/arch/acorn32/podulebus/if_ie.c
--- a/sys/arch/acorn32/podulebus/if_ie.c        Thu Dec 15 09:17:26 2016 +0000
+++ b/sys/arch/acorn32/podulebus/if_ie.c        Thu Dec 15 09:28:02 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.37 2016/06/10 13:27:10 ozaki-r Exp $ */
+/* $NetBSD: if_ie.c,v 1.38 2016/12/15 09:28:02 ozaki-r Exp $ */
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson.
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.37 2016/06/10 13:27:10 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.38 2016/12/15 09:28:02 ozaki-r Exp $");
 
 #define IGNORE_ETHER1_IDROM_CHECKSUM
 
@@ -1278,10 +1278,6 @@
        return;
     }
 
-    ifp->if_ipackets++;
-
-    bpf_mtap(ifp, m);
-
     if_percpuq_enqueue(ifp->if_percpuq, m);
 }
 
diff -r cf033c124c91 -r d508101822b7 sys/arch/amiga/dev/if_es.c
--- a/sys/arch/amiga/dev/if_es.c        Thu Dec 15 09:17:26 2016 +0000
+++ b/sys/arch/amiga/dev/if_es.c        Thu Dec 15 09:28:02 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_es.c,v 1.55 2016/06/10 13:27:10 ozaki-r Exp $ */
+/*     $NetBSD: if_es.c,v 1.56 2016/12/15 09:28:02 ozaki-r Exp $ */
 
 /*
  * Copyright (c) 1995 Michael L. Hitch
@@ -33,7 +33,7 @@
 #include "opt_ns.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.55 2016/06/10 13:27:10 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.56 2016/12/15 09:28:02 ozaki-r Exp $");
 
 
 #include <sys/param.h>
@@ -659,7 +659,6 @@
        }
 #endif
 #endif /* USEPKTBUF */
-       ifp->if_ipackets++;
        MGETHDR(m, M_DONTWAIT, MT_DATA);
        if (m == NULL)
                return;
@@ -720,7 +719,6 @@
         * Check if there's a BPF listener on this interface.  If so, hand off
         * the raw packet to bpf.
         */
-       bpf_mtap(ifp, top);
        if_percpuq_enqueue(ifp->if_percpuq, top);
 #ifdef ESDEBUG
        if (--sc->sc_smcbusy) {
diff -r cf033c124c91 -r d508101822b7 sys/arch/amiga/dev/if_qn.c
--- a/sys/arch/amiga/dev/if_qn.c        Thu Dec 15 09:17:26 2016 +0000
+++ b/sys/arch/amiga/dev/if_qn.c        Thu Dec 15 09:28:02 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_qn.c,v 1.42 2016/06/10 13:27:10 ozaki-r Exp $ */
+/*     $NetBSD: if_qn.c,v 1.43 2016/12/15 09:28:02 ozaki-r Exp $ */
 
 /*
  * Copyright (c) 1995 Mika Kortelainen
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.42 2016/06/10 13:27:10 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.43 2016/12/15 09:28:02 ozaki-r Exp $");
 
 #include "qn.h"
 #if NQN > 0
@@ -582,9 +582,6 @@
                len -= len1;
        }
 
-       /* Tap off BPF listeners */
-       bpf_mtap(ifp, head);
-
        if_percpuq_enqueue(ifp->if_percpuq, head);
        return;
 
@@ -693,8 +690,6 @@
 
                /* Read the packet. */
                qn_get_packet(sc, len);
-
-               ++sc->sc_ethercom.ec_if.if_ipackets;
        }
 
 #ifdef QN_DEBUG
diff -r cf033c124c91 -r d508101822b7 sys/arch/arm/at91/at91emac.c
--- a/sys/arch/arm/at91/at91emac.c      Thu Dec 15 09:17:26 2016 +0000
+++ b/sys/arch/arm/at91/at91emac.c      Thu Dec 15 09:28:02 2016 +0000
@@ -1,5 +1,5 @@
-/*     $Id: at91emac.c,v 1.17 2016/06/10 13:27:10 ozaki-r Exp $        */
-/*     $NetBSD: at91emac.c,v 1.17 2016/06/10 13:27:10 ozaki-r Exp $    */
+/*     $Id: at91emac.c,v 1.18 2016/12/15 09:28:02 ozaki-r Exp $        */
+/*     $NetBSD: at91emac.c,v 1.18 2016/12/15 09:28:02 ozaki-r Exp $    */
 
 /*
  * Copyright (c) 2007 Embedtronics Oy
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.17 2016/06/10 13:27:10 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.18 2016/12/15 09:28:02 ozaki-r Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -282,7 +282,6 @@
                                m_set_rcvif(sc->rxq[bi].m, ifp);
                                sc->rxq[bi].m->m_pkthdr.len = 
                                        sc->rxq[bi].m->m_len = fl;
-                               bpf_mtap(ifp, sc->rxq[bi].m);
                                DPRINTFN(2,("received %u bytes packet\n", fl));
                                if_percpuq_enqueue(ifp->if_percpuq, sc->rxq[bi].m);
                                if (mtod(m, intptr_t) & 3) {
diff -r cf033c124c91 -r d508101822b7 sys/arch/arm/broadcom/bcm53xx_eth.c
--- a/sys/arch/arm/broadcom/bcm53xx_eth.c       Thu Dec 15 09:17:26 2016 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_eth.c       Thu Dec 15 09:28:02 2016 +0000
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.28 2016/06/10 13:27:11 ozaki-r Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.29 2016/12/15 09:28:02 ozaki-r Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -1013,7 +1013,6 @@
        }
        m_set_rcvif(m, ifp);
 
-       ifp->if_ipackets++;
        ifp->if_ibytes += m->m_pkthdr.len;
 
        /*
@@ -1025,7 +1024,6 @@
        mutex_enter(sc->sc_lock);
 #else
        int s = splnet();
-       bpf_mtap(ifp, m);
        if_input(ifp, m);
        splx(s);
 #endif
diff -r cf033c124c91 -r d508101822b7 sys/arch/arm/ep93xx/epe.c
--- a/sys/arch/arm/ep93xx/epe.c Thu Dec 15 09:17:26 2016 +0000
+++ b/sys/arch/arm/ep93xx/epe.c Thu Dec 15 09:28:02 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: epe.c,v 1.34 2016/06/10 13:27:11 ozaki-r Exp $ */
+/*     $NetBSD: epe.c,v 1.35 2016/12/15 09:28:02 ozaki-r Exp $ */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.34 2016/06/10 13:27:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.35 2016/12/15 09:28:02 ozaki-r Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -230,7 +230,6 @@
                                m_set_rcvif(sc->rxq[bi].m, ifp);
                                sc->rxq[bi].m->m_pkthdr.len = 
                                        sc->rxq[bi].m->m_len = fl;
-                               bpf_mtap(ifp, sc->rxq[bi].m);
                                if_percpuq_enqueue(ifp->if_percpuq,
                                    sc->rxq[bi].m);
                                sc->rxq[bi].m = m;
diff -r cf033c124c91 -r d508101822b7 sys/arch/arm/gemini/gemini_gmac.c
--- a/sys/arch/arm/gemini/gemini_gmac.c Thu Dec 15 09:17:26 2016 +0000
+++ b/sys/arch/arm/gemini/gemini_gmac.c Thu Dec 15 09:28:02 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_gmac.c,v 1.10 2016/12/06 07:09:38 ozaki-r Exp $ */
+/* $NetBSD: gemini_gmac.c,v 1.11 2016/12/15 09:28:02 ozaki-r Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -49,7 +49,7 @@
 
 #include <sys/gpio.h>
 
-__KERNEL_RCSID(0, "$NetBSD: gemini_gmac.c,v 1.10 2016/12/06 07:09:38 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_gmac.c,v 1.11 2016/12/15 09:28:02 ozaki-r Exp $");
 
 #define        SWFREEQ_DESCS   256     /* one page worth */
 #define        HWFREEQ_DESCS   256     /* one page worth */
@@ -848,14 +848,12 @@
         */
        m = hwq->hwq_rxmbuf;
        m_set_rcvif(m, ifp);    /* set receive interface */
-       ifp->if_ipackets++;
        ifp->if_ibytes += m->m_pkthdr.len;
        switch (DESC0_RXSTS_GET(d->d_desc0)) {
        case DESC0_RXSTS_GOOD:
        case DESC0_RXSTS_LONG:
                m->m_data += 2;
                KASSERT(m_length(m) == m->m_pkthdr.len);
-               bpf_mtap(ifp, m);
                if_percpuq_enqueue(ifp->if_percpuq, m);
                break;
        default:
diff -r cf033c124c91 -r d508101822b7 sys/arch/arm/gemini/if_gpn.c
--- a/sys/arch/arm/gemini/if_gpn.c      Thu Dec 15 09:17:26 2016 +0000
+++ b/sys/arch/arm/gemini/if_gpn.c      Thu Dec 15 09:28:02 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gpn.c,v 1.6 2016/06/10 13:27:11 ozaki-r Exp $ */
+/* $NetBSD: if_gpn.c,v 1.7 2016/12/15 09:28:02 ozaki-r Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -32,7 +32,7 @@
 
 #include "opt_gemini.h"
 
-__KERNEL_RCSID(0, "$NetBSD: if_gpn.c,v 1.6 2016/06/10 13:27:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gpn.c,v 1.7 2016/12/15 09:28:02 ozaki-r Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -300,9 +300,7 @@
                sc->sc_rxmbuf = NULL;
                m_set_rcvif(m, ifp);
                KASSERT(((m->m_pkthdr.len + 63) >> 6) == gd->gd_pktlen64);
-               ifp->if_ipackets++;
                ifp->if_ibytes += m->m_pkthdr.len;
-               bpf_mtap(ifp, m);
 #ifdef GPNDEBUG
                printf("%s: rx len=%d crc=%#x\n", ifp->if_xname,
                    m->m_pkthdr.len, m_crc32_le(m));
diff -r cf033c124c91 -r d508101822b7 sys/arch/arm/imx/if_enet.c
--- a/sys/arch/arm/imx/if_enet.c        Thu Dec 15 09:17:26 2016 +0000
+++ b/sys/arch/arm/imx/if_enet.c        Thu Dec 15 09:28:02 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_enet.c,v 1.9 2016/10/02 14:25:26 christos Exp $     */
+/*     $NetBSD: if_enet.c,v 1.10 2016/12/15 09:28:02 ozaki-r Exp $     */
 
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.9 2016/10/02 14:25:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.10 2016/12/15 09:28:02 ozaki-r Exp $");
 
 #include "vlan.h"
 
@@ -640,7 +640,6 @@
 
                        } else {
                                /* packet receive ok */
-                               ifp->if_ipackets++;
                                m_set_rcvif(m0, ifp);
                                m0->m_pkthdr.len = amount;
 
@@ -653,9 +652,6 @@
                                    M_CSUM_TCPv6 | M_CSUM_UDPv6))
                                        enet_rx_csum(sc, ifp, m0, idx);
 
-                               /* Pass this up to any BPF listeners */
-                               bpf_mtap(ifp, m0);
-
                                if_percpuq_enqueue(ifp->if_percpuq, m0);
                        }
 
diff -r cf033c124c91 -r d508101822b7 sys/arch/arm/omap/if_cpsw.c
--- a/sys/arch/arm/omap/if_cpsw.c       Thu Dec 15 09:17:26 2016 +0000
+++ b/sys/arch/arm/omap/if_cpsw.c       Thu Dec 15 09:28:02 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_cpsw.c,v 1.17 2016/12/08 01:12:00 ozaki-r Exp $     */
+/*     $NetBSD: if_cpsw.c,v 1.18 2016/12/15 09:28:02 ozaki-r Exp $     */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.17 2016/12/08 01:12:00 ozaki-r Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.18 2016/12/15 09:28:02 ozaki-r Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -1167,10 +1167,6 @@
                m->m_pkthdr.len = m->m_len = len;
                m->m_data += off;



Home | Main Index | Thread Index | Old Index