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

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

details:   https://anonhg.NetBSD.org/src/rev/245c050412a1
branches:  netbsd-8
changeset: 460471:245c050412a1
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Oct 24 16:06:09 2019 +0000

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

        sys/dev/ic/i82586.c: revision 1.86
        sys/arch/arm/ep93xx/epe.c: revision 1.45
        sys/dev/pcmcia/if_cnw.c: revision 1.66
        sys/arch/mac68k/nubus/if_netdock_nubus.c: revision 1.31
        sys/dev/qbus/if_il.c: revision 1.36
        sys/dev/pcmcia/if_ray.c: revision 1.95
        sys/dev/qbus/if_qt.c: revision 1.24

if_percpuq(9) automatically increments if_ipackets, so don't increment it in
the driver itself to prevent double count.

diffstat:

 sys/arch/arm/ep93xx/epe.c                |  5 ++---
 sys/arch/mac68k/nubus/if_netdock_nubus.c |  8 +++-----
 sys/dev/ic/i82586.c                      |  5 ++---
 sys/dev/pcmcia/if_cnw.c                  |  5 ++---
 sys/dev/pcmcia/if_ray.c                  |  5 ++---
 sys/dev/qbus/if_il.c                     |  5 ++---
 sys/dev/qbus/if_qt.c                     |  5 ++---
 7 files changed, 15 insertions(+), 23 deletions(-)

diffs (185 lines):

diff -r 170cb4973347 -r 245c050412a1 sys/arch/arm/ep93xx/epe.c
--- a/sys/arch/arm/ep93xx/epe.c Thu Oct 24 16:03:38 2019 +0000
+++ b/sys/arch/arm/ep93xx/epe.c Thu Oct 24 16:06:09 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: epe.c,v 1.36.6.1 2018/07/26 23:55:28 snj Exp $ */
+/*     $NetBSD: epe.c,v 1.36.6.2 2019/10/24 16:06:09 martin Exp $      */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.36.6.1 2018/07/26 23:55:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.36.6.2 2019/10/24 16:06:09 martin Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -259,7 +259,6 @@
        }
 
        if (ndq > 0) {
-               ifp->if_ipackets += ndq;
                CTRLPAGE_DMASYNC(TX_QLEN * 3 * sizeof(uint32_t),
                        RX_QLEN * 4 * sizeof(uint32_t), 
                        BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
diff -r 170cb4973347 -r 245c050412a1 sys/arch/mac68k/nubus/if_netdock_nubus.c
--- a/sys/arch/mac68k/nubus/if_netdock_nubus.c  Thu Oct 24 16:03:38 2019 +0000
+++ b/sys/arch/mac68k/nubus/if_netdock_nubus.c  Thu Oct 24 16:06:09 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_netdock_nubus.c,v 1.25.8.1 2017/08/05 04:19:27 snj Exp $    */
+/*     $NetBSD: if_netdock_nubus.c,v 1.25.8.2 2019/10/24 16:06:09 martin Exp $ */
 
 /*
  * Copyright (C) 2000,2002 Daishi Kato <daishi%axlight.com@localhost>
@@ -43,7 +43,7 @@
 /***********************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.25.8.1 2017/08/05 04:19:27 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.25.8.2 2019/10/24 16:06:09 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -726,9 +726,7 @@
                len -= ETHER_CRC_LEN;
 
                if ((regdata1 & 0x00ac) == 0) {
-                       if (netdock_read(sc, len))
-                               ifp->if_ipackets++;
-                       else
+                       if (netdock_read(sc, len) == 0)
                                ifp->if_ierrors++;
                } else {
                        ifp->if_ierrors++;
diff -r 170cb4973347 -r 245c050412a1 sys/dev/ic/i82586.c
--- a/sys/dev/ic/i82586.c       Thu Oct 24 16:03:38 2019 +0000
+++ b/sys/dev/ic/i82586.c       Thu Oct 24 16:06:09 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82586.c,v 1.76.6.1 2018/07/26 23:55:29 snj Exp $      */
+/*     $NetBSD: i82586.c,v 1.76.6.2 2019/10/24 16:06:09 martin Exp $   */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -137,7 +137,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.76.6.1 2018/07/26 23:55:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.76.6.2 2019/10/24 16:06:09 martin Exp $");
 
 
 #include <sys/param.h>
@@ -1041,7 +1041,6 @@
         * Finally pass this packet up to higher layers.
         */
        if_percpuq_enqueue((&sc->sc_ethercom.ec_if)->if_percpuq, m);
-       sc->sc_ethercom.ec_if.if_ipackets++;
        return (0);
 }
 
diff -r 170cb4973347 -r 245c050412a1 sys/dev/pcmcia/if_cnw.c
--- a/sys/dev/pcmcia/if_cnw.c   Thu Oct 24 16:03:38 2019 +0000
+++ b/sys/dev/pcmcia/if_cnw.c   Thu Oct 24 16:06:09 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_cnw.c,v 1.61.8.1 2018/07/26 23:55:30 snj Exp $      */
+/*     $NetBSD: if_cnw.c,v 1.61.8.2 2019/10/24 16:06:09 martin Exp $   */
 
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.61.8.1 2018/07/26 23:55:30 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.61.8.2 2019/10/24 16:06:09 martin Exp $");
 
 #include "opt_inet.h"
 
@@ -849,7 +849,6 @@
                        ++ifp->if_ierrors;
                        return;
                }
-               ++ifp->if_ipackets;
 
                /* Pass the packet up. */
                if_percpuq_enqueue(ifp->if_percpuq, m);
diff -r 170cb4973347 -r 245c050412a1 sys/dev/pcmcia/if_ray.c
--- a/sys/dev/pcmcia/if_ray.c   Thu Oct 24 16:03:38 2019 +0000
+++ b/sys/dev/pcmcia/if_ray.c   Thu Oct 24 16:06:09 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ray.c,v 1.86.8.1 2018/07/26 23:55:30 snj Exp $      */
+/*     $NetBSD: if_ray.c,v 1.86.8.2 2019/10/24 16:06:09 martin Exp $   */
 
 /*
  * Copyright (c) 2000 Christian E. Hopps
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.86.8.1 2018/07/26 23:55:30 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.86.8.2 2019/10/24 16:06:09 martin Exp $");
 
 #include "opt_inet.h"
 
@@ -1519,7 +1519,6 @@
        m_adj(m, (char *)eh - (char *)frame);
        bpf_mtap(ifp, m);
        /* XXX doesn't appear to be included m->m_flags |= M_HASFCS; */
-       ifp->if_ipackets++;
        if_percpuq_enqueue(ifp->if_percpuq, m);
 }
 
diff -r 170cb4973347 -r 245c050412a1 sys/dev/qbus/if_il.c
--- a/sys/dev/qbus/if_il.c      Thu Oct 24 16:03:38 2019 +0000
+++ b/sys/dev/qbus/if_il.c      Thu Oct 24 16:06:09 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_il.c,v 1.29 2016/02/09 08:32:11 ozaki-r Exp $       */
+/*     $NetBSD: if_il.c,v 1.29.10.1 2019/10/24 16:06:09 martin Exp $   */
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.
  * All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.29 2016/02/09 08:32:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.29.10.1 2019/10/24 16:06:09 martin Exp $");
 
 #include "opt_inet.h"
 
@@ -504,7 +504,6 @@
        struct mbuf *m;
        int len, s;
 
-       sc->sc_if.if_ipackets++;
 #ifdef notyet
        if (sc->sc_ifuba.ifu_flags & UBA_NEEDBDP)
                UBAPURGE(is->is_ifuba.ifu_uba, is->is_ifuba.ifu_r.ifrw_bdp);
diff -r 170cb4973347 -r 245c050412a1 sys/dev/qbus/if_qt.c
--- a/sys/dev/qbus/if_qt.c      Thu Oct 24 16:03:38 2019 +0000
+++ b/sys/dev/qbus/if_qt.c      Thu Oct 24 16:06:09 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_qt.c,v 1.21.8.1 2018/07/26 23:55:30 snj Exp $       */
+/*     $NetBSD: if_qt.c,v 1.21.8.2 2019/10/24 16:06:09 martin Exp $    */
 /*
  * Copyright (c) 1992 Steven M. Schultz
  * All rights reserved.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.21.8.1 2018/07/26 23:55:30 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.21.8.2 2019/10/24 16:06:09 martin Exp $");
 
 #include "opt_inet.h"
 
@@ -562,7 +562,6 @@
                        goto rnext;
                        }
                len = (rp->rmd1 & RMD1_MCNT) - 4;       /* -4 for CRC */
-               sc->is_if.if_ipackets++;
 
                if      ((rp->rmd0 & RMD0_ERR3) || (rp->rmd2 & RMD2_ERR4))
                        {