[src/trunk]: src/sys/dev/pcmcia ether_input() automatically add input bytes t...

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

details:   https://anonhg.NetBSD.org/src/rev/fbe62d38aca5
branches:  trunk
changeset: 1004487:fbe62d38aca5
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Oct 30 10:12:37 2019 +0000

description:
ether_input() automatically add input bytes to if_ibytes, so it's not
required to do in the driver who use ether_input().

diffstat:

 sys/arch/arm/broadcom/bcm53xx_eth.c   |  4 +---
 sys/arch/arm/gemini/gemini_gmac.c     |  5 ++---
 sys/arch/arm/gemini/if_gpn.c          |  5 ++---
 sys/arch/powerpc/booke/dev/pq3etsec.c |  6 ++----
 sys/dev/pcmcia/if_xi.c                |  5 ++---
 5 files changed, 9 insertions(+), 16 deletions(-)

diffs (126 lines):

diff -r 56999693967c -r fbe62d38aca5 sys/arch/arm/broadcom/bcm53xx_eth.c
--- a/sys/arch/arm/broadcom/bcm53xx_eth.c       Wed Oct 30 07:59:44 2019 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_eth.c       Wed Oct 30 10:12:37 2019 +0000
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.38 2019/05/29 13:25:54 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.39 2019/10/30 10:12:37 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -1032,8 +1032,6 @@
        }
        m_set_rcvif(m, ifp);
 
-       ifp->if_ibytes += m->m_pkthdr.len;
-
        /*
         * Let's give it to the network subsystm to deal with.
         */
diff -r 56999693967c -r fbe62d38aca5 sys/arch/arm/gemini/gemini_gmac.c
--- a/sys/arch/arm/gemini/gemini_gmac.c Wed Oct 30 07:59:44 2019 +0000
+++ b/sys/arch/arm/gemini/gemini_gmac.c Wed Oct 30 10:12:37 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_gmac.c,v 1.17 2019/01/22 03:42:25 msaitoh Exp $ */
+/* $NetBSD: gemini_gmac.c,v 1.18 2019/10/30 10:12:37 msaitoh 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.17 2019/01/22 03:42:25 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_gmac.c,v 1.18 2019/10/30 10:12:37 msaitoh Exp $");
 
 #define        SWFREEQ_DESCS   256     /* one page worth */
 #define        HWFREEQ_DESCS   256     /* one page worth */
@@ -852,7 +852,6 @@
         */
        m = hwq->hwq_rxmbuf;
        m_set_rcvif(m, ifp);    /* set receive interface */
-       ifp->if_ibytes += m->m_pkthdr.len;
        switch (DESC0_RXSTS_GET(d->d_desc0)) {
        case DESC0_RXSTS_GOOD:
        case DESC0_RXSTS_LONG:
diff -r 56999693967c -r fbe62d38aca5 sys/arch/arm/gemini/if_gpn.c
--- a/sys/arch/arm/gemini/if_gpn.c      Wed Oct 30 07:59:44 2019 +0000
+++ b/sys/arch/arm/gemini/if_gpn.c      Wed Oct 30 10:12:37 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gpn.c,v 1.12 2019/05/29 10:07:28 msaitoh Exp $ */
+/* $NetBSD: if_gpn.c,v 1.13 2019/10/30 10:12:37 msaitoh 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.12 2019/05/29 10:07:28 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gpn.c,v 1.13 2019/10/30 10:12:37 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -299,7 +299,6 @@
                sc->sc_rxmbuf = NULL;
                m_set_rcvif(m, ifp);
                KASSERT(((m->m_pkthdr.len + 63) >> 6) == gd->gd_pktlen64);
-               ifp->if_ibytes += m->m_pkthdr.len;
 #ifdef GPNDEBUG
                printf("%s: rx len=%d crc=%#x\n", ifp->if_xname,
                    m->m_pkthdr.len, m_crc32_le(m));
diff -r 56999693967c -r fbe62d38aca5 sys/arch/powerpc/booke/dev/pq3etsec.c
--- a/sys/arch/powerpc/booke/dev/pq3etsec.c     Wed Oct 30 07:59:44 2019 +0000
+++ b/sys/arch/powerpc/booke/dev/pq3etsec.c     Wed Oct 30 10:12:37 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pq3etsec.c,v 1.46 2019/07/09 08:46:58 msaitoh Exp $    */
+/*     $NetBSD: pq3etsec.c,v 1.47 2019/10/30 10:12:37 msaitoh Exp $    */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.46 2019/07/09 08:46:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.47 2019/10/30 10:12:37 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -1609,8 +1609,6 @@
        m->m_flags |= M_HASFCS;
        m_set_rcvif(m, &sc->sc_if);
 
-       ifp->if_ibytes += m->m_pkthdr.len;
-
        /*
         * Let's give it to the network subsystm to deal with.
         */
diff -r 56999693967c -r fbe62d38aca5 sys/dev/pcmcia/if_xi.c
--- a/sys/dev/pcmcia/if_xi.c    Wed Oct 30 07:59:44 2019 +0000
+++ b/sys/dev/pcmcia/if_xi.c    Wed Oct 30 10:12:37 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_xi.c,v 1.90 2019/05/28 07:41:49 msaitoh Exp $ */
+/*     $NetBSD: if_xi.c,v 1.91 2019/10/30 10:12:37 msaitoh Exp $ */
 /*     OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp   */
 
 /*
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.90 2019/05/28 07:41:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.91 2019/10/30 10:12:37 msaitoh Exp $");
 
 #include "opt_inet.h"
 
@@ -330,7 +330,6 @@
                }
                tempint = xi_get(sc);   /* XXX doesn't check the error! */
                recvcount += tempint;
-               ifp->if_ibytes += tempint;
                esr = bus_space_read_1(sc->sc_bst, sc->sc_bsh, ESR);
                rsr = bus_space_read_1(sc->sc_bst, sc->sc_bsh, RSR);
        }