[src/netbsd-9]: src/sys Pull up following revision(s) (requested by msaitoh i...

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

details:   https://anonhg.NetBSD.org/src/rev/2407c685b8fc
branches:  netbsd-9
changeset: 460852:2407c685b8fc
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Nov 06 09:59:38 2019 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #403):

        sys/arch/arm/broadcom/bcm53xx_eth.c: revision 1.39
        sys/dev/pcmcia/if_xi.c: revision 1.91
        sys/dev/ic/aic6915.c: revision 1.40
        sys/dev/pci/if_tl.c: revision 1.117
        sys/arch/arm/gemini/gemini_gmac.c: revision 1.18
        sys/dev/ic/elinkxl.c: revision 1.133
        sys/dev/pci/if_ste.c: revision 1.57
        sys/dev/pci/if_alc.c: revision 1.43
        sys/dev/pci/if_stge.c: revision 1.72
        sys/dev/pci/if_ale.c: revision 1.34
        sys/dev/pci/if_age.c: revision 1.62
        sys/dev/pci/if_txp.c: revision 1.60
        sys/dev/ic/i82557.c: revision 1.156
        sys/dev/pci/if_vte.c: revision 1.27
        sys/arch/powerpc/booke/dev/pq3etsec.c: revision 1.47
        sys/arch/arm/gemini/if_gpn.c: revision 1.13

 if_percpuq(9) and ether_input() automatically increment if_ipackets, so don't add number of
RX frames from device's statistics counter to if_ipackets to avoid double
count.

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/ic/aic6915.c                  |  6 ++----
 sys/dev/ic/elinkxl.c                  |  6 ++----
 sys/dev/ic/i82557.c                   |  5 ++---
 sys/dev/pci/if_age.c                  |  6 ++----
 sys/dev/pci/if_alc.c                  |  4 +---
 sys/dev/pci/if_ale.c                  |  6 ++----
 sys/dev/pci/if_ste.c                  |  8 ++++----
 sys/dev/pci/if_stge.c                 |  7 +++----
 sys/dev/pci/if_tl.c                   |  5 ++---
 sys/dev/pci/if_txp.c                  |  5 ++---
 sys/dev/pci/if_vte.c                  |  5 ++---
 sys/dev/pcmcia/if_xi.c                |  5 ++---
 16 files changed, 33 insertions(+), 55 deletions(-)

diffs (truncated from 413 to 300 lines):

diff -r 43be0e5593d5 -r 2407c685b8fc sys/arch/arm/broadcom/bcm53xx_eth.c
--- a/sys/arch/arm/broadcom/bcm53xx_eth.c       Wed Nov 06 09:53:59 2019 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_eth.c       Wed Nov 06 09:59:38 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.38.2.1 2019/11/06 09:59:38 martin 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 43be0e5593d5 -r 2407c685b8fc sys/arch/arm/gemini/gemini_gmac.c
--- a/sys/arch/arm/gemini/gemini_gmac.c Wed Nov 06 09:53:59 2019 +0000
+++ b/sys/arch/arm/gemini/gemini_gmac.c Wed Nov 06 09:59:38 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.17.4.1 2019/11/06 09:59:39 martin 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.17.4.1 2019/11/06 09:59:39 martin 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 43be0e5593d5 -r 2407c685b8fc sys/arch/arm/gemini/if_gpn.c
--- a/sys/arch/arm/gemini/if_gpn.c      Wed Nov 06 09:53:59 2019 +0000
+++ b/sys/arch/arm/gemini/if_gpn.c      Wed Nov 06 09:59:38 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.12.2.1 2019/11/06 09:59:39 martin 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.12.2.1 2019/11/06 09:59:39 martin 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 43be0e5593d5 -r 2407c685b8fc sys/arch/powerpc/booke/dev/pq3etsec.c
--- a/sys/arch/powerpc/booke/dev/pq3etsec.c     Wed Nov 06 09:53:59 2019 +0000
+++ b/sys/arch/powerpc/booke/dev/pq3etsec.c     Wed Nov 06 09:59:38 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.46.2.1 2019/11/06 09:59:39 martin 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.46.2.1 2019/11/06 09:59:39 martin 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 43be0e5593d5 -r 2407c685b8fc sys/dev/ic/aic6915.c
--- a/sys/dev/ic/aic6915.c      Wed Nov 06 09:53:59 2019 +0000
+++ b/sys/dev/ic/aic6915.c      Wed Nov 06 09:59:38 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aic6915.c,v 1.39 2019/05/28 07:41:48 msaitoh Exp $     */
+/*     $NetBSD: aic6915.c,v 1.39.2.1 2019/11/06 09:59:38 martin Exp $  */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.39 2019/05/28 07:41:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.39.2.1 2019/11/06 09:59:38 martin Exp $");
 
 
 #include <sys/param.h>
@@ -855,8 +855,6 @@
            stats.TransmitAbortDueToExcessingDeferral +
            stats.FramesLostDueToInternalTransmitErrors;
 
-       ifp->if_ipackets += stats.ReceiveOKFrames;
-
        ifp->if_ierrors += stats.ReceiveCRCErrors + stats.AlignmentErrors +
            stats.ReceiveFramesTooLong + stats.ReceiveFramesTooShort +
            stats.ReceiveFramesJabbersError +
diff -r 43be0e5593d5 -r 2407c685b8fc sys/dev/ic/elinkxl.c
--- a/sys/dev/ic/elinkxl.c      Wed Nov 06 09:53:59 2019 +0000
+++ b/sys/dev/ic/elinkxl.c      Wed Nov 06 09:59:38 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elinkxl.c,v 1.131 2019/05/28 07:41:48 msaitoh Exp $    */
+/*     $NetBSD: elinkxl.c,v 1.131.2.1 2019/11/06 09:59:38 martin Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.131 2019/05/28 07:41:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.131.2.1 2019/11/06 09:59:38 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1487,8 +1487,6 @@
 
        GO_WINDOW(6);
        upperok = bus_space_read_1(iot, ioh, UPPER_FRAMES_OK);
-       ifp->if_ipackets += bus_space_read_1(iot, ioh, RX_FRAMES_OK);
-       ifp->if_ipackets += (upperok & 0x03) << 8;
        ifp->if_opackets += bus_space_read_1(iot, ioh, TX_FRAMES_OK);
        ifp->if_opackets += (upperok & 0x30) << 4;
        ifp->if_ierrors += bus_space_read_1(iot, ioh, RX_OVERRUNS);
diff -r 43be0e5593d5 -r 2407c685b8fc sys/dev/ic/i82557.c
--- a/sys/dev/ic/i82557.c       Wed Nov 06 09:53:59 2019 +0000
+++ b/sys/dev/ic/i82557.c       Wed Nov 06 09:59:38 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82557.c,v 1.154.2.1 2019/09/22 12:13:33 martin Exp $  */
+/*     $NetBSD: i82557.c,v 1.154.2.2 2019/11/06 09:59:38 martin Exp $  */
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.154.2.1 2019/09/22 12:13:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.154.2.2 2019/11/06 09:59:38 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1479,7 +1479,6 @@
        ifp->if_opackets += le32toh(sp->tx_good);
        ifp->if_collisions += le32toh(sp->tx_total_collisions);
        if (sp->rx_good) {
-               ifp->if_ipackets += le32toh(sp->rx_good);
                sc->sc_rxidle = 0;
        } else if (sc->sc_flags & FXPF_RECV_WORKAROUND) {
                sc->sc_rxidle++;
diff -r 43be0e5593d5 -r 2407c685b8fc sys/dev/pci/if_age.c
--- a/sys/dev/pci/if_age.c      Wed Nov 06 09:53:59 2019 +0000
+++ b/sys/dev/pci/if_age.c      Wed Nov 06 09:59:38 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_age.c,v 1.60.2.1 2019/09/22 12:15:28 martin Exp $ */
+/*     $NetBSD: if_age.c,v 1.60.2.2 2019/11/06 09:59:39 martin 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.60.2.1 2019/09/22 12:15:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.60.2.2 2019/11/06 09:59:39 martin Exp $");
 
 #include "vlan.h"
 
@@ -2043,8 +2043,6 @@
            smb->tx_late_colls + smb->tx_underrun +
            smb->tx_pkts_truncated;
 
-       ifp->if_ipackets += smb->rx_frames;
-
        ifp->if_ierrors += smb->rx_crcerrs + smb->rx_lenerrs +
            smb->rx_runts + smb->rx_pkts_truncated +
            smb->rx_fifo_oflows + smb->rx_desc_oflows +
diff -r 43be0e5593d5 -r 2407c685b8fc sys/dev/pci/if_alc.c
--- a/sys/dev/pci/if_alc.c      Wed Nov 06 09:53:59 2019 +0000
+++ b/sys/dev/pci/if_alc.c      Wed Nov 06 09:59:38 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_alc.c,v 1.38.2.1 2019/10/24 16:23:17 martin Exp $   */
+/*     $NetBSD: if_alc.c,v 1.38.2.2 2019/11/06 09:59:38 martin Exp $   */
 /*     $OpenBSD: if_alc.c,v 1.1 2009/08/08 09:31:13 kevlo Exp $        */
 /*-
  * Copyright (c) 2009, Pyun YongHyeon <yongari%FreeBSD.org@localhost>
@@ -2276,8 +2276,6 @@
        ifp->if_oerrors += smb->tx_late_colls + smb->tx_excess_colls +
            smb->tx_underrun + smb->tx_pkts_truncated;
 
-       ifp->if_ipackets += smb->rx_frames;
-
        ifp->if_ierrors += smb->rx_crcerrs + smb->rx_lenerrs +
            smb->rx_runts + smb->rx_pkts_truncated +
            smb->rx_fifo_oflows + smb->rx_rrs_errs +
diff -r 43be0e5593d5 -r 2407c685b8fc sys/dev/pci/if_ale.c
--- a/sys/dev/pci/if_ale.c      Wed Nov 06 09:53:59 2019 +0000
+++ b/sys/dev/pci/if_ale.c      Wed Nov 06 09:59:38 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ale.c,v 1.33 2019/07/09 08:46:59 msaitoh Exp $      */
+/*     $NetBSD: if_ale.c,v 1.33.2.1 2019/11/06 09:59:39 martin 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.33 2019/07/09 08:46:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.33.2.1 2019/11/06 09:59:39 martin Exp $");
 
 #include "vlan.h"
 
@@ -1273,8 +1273,6 @@
        ifp->if_oerrors += smb->tx_abort + smb->tx_late_colls +
            smb->tx_underrun;
 
-       ifp->if_ipackets += smb->rx_frames;
-
        ifp->if_ierrors += smb->rx_crcerrs + smb->rx_lenerrs +
            smb->rx_runts + smb->rx_pkts_truncated +
            smb->rx_fifo_oflows + smb->rx_rrs_errs +
diff -r 43be0e5593d5 -r 2407c685b8fc sys/dev/pci/if_ste.c
--- a/sys/dev/pci/if_ste.c      Wed Nov 06 09:53:59 2019 +0000
+++ b/sys/dev/pci/if_ste.c      Wed Nov 06 09:59:38 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ste.c,v 1.56 2019/05/28 07:41:49 msaitoh Exp $      */
+/*     $NetBSD: if_ste.c,v 1.56.2.1 2019/11/06 09:59:38 martin Exp $   */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.56 2019/05/28 07:41:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.56.2.1 2019/11/06 09:59:38 martin Exp $");
 
 
 #include <sys/param.h>
@@ -1099,8 +1099,8 @@
 
        ifp->if_opackets +=
            (u_int) bus_space_read_2(st, sh, STE_FramesTransmittedOK);
-       ifp->if_ipackets +=
-           (u_int) bus_space_read_2(st, sh, STE_FramesReceivedOK);
+
+       (u_int) bus_space_read_2(st, sh, STE_FramesReceivedOK);
 
        ifp->if_collisions +=
            (u_int) bus_space_read_1(st, sh, STE_LateCollisions) +
diff -r 43be0e5593d5 -r 2407c685b8fc sys/dev/pci/if_stge.c
--- a/sys/dev/pci/if_stge.c     Wed Nov 06 09:53:59 2019 +0000
+++ b/sys/dev/pci/if_stge.c     Wed Nov 06 09:59:38 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_stge.c,v 1.70 2019/07/09 08:46:59 msaitoh Exp $     */
+/*     $NetBSD: if_stge.c,v 1.70.2.1 2019/11/06 09:59:39 martin Exp $  */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.70 2019/07/09 08:46:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.70.2.1 2019/11/06 09:59:39 martin Exp $");
 
 
 #include <sys/param.h>
@@ -1420,8 +1420,7 @@