Module Name: src
Committed By: martin
Date: Wed Oct 23 19:43:25 UTC 2019
Modified Files:
src/sys/arch/arm/ep93xx [netbsd-9]: epe.c
src/sys/arch/arm/sunxi [netbsd-9]: sunxi_can.c
src/sys/arch/mac68k/nubus [netbsd-9]: if_netdock_nubus.c
src/sys/dev/ic [netbsd-9]: i82586.c
src/sys/dev/pcmcia [netbsd-9]: if_cnw.c if_ray.c
src/sys/dev/qbus [netbsd-9]: if_il.c if_qt.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #371):
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/arch/arm/sunxi/sunxi_can.c: revision 1.2
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_ipackets is incremented in can_input(), so don't increment it in
sunxi_can_rx_intr to prevent double count. OK'd by bouyer@.
if_percpuq(9) automatically increments if_ipackets, so don't increment it in
the driver itself to prevent double count.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.44.2.1 src/sys/arch/arm/ep93xx/epe.c
cvs rdiff -u -r1.1 -r1.1.8.1 src/sys/arch/arm/sunxi/sunxi_can.c
cvs rdiff -u -r1.29 -r1.29.4.1 src/sys/arch/mac68k/nubus/if_netdock_nubus.c
cvs rdiff -u -r1.85 -r1.85.2.1 src/sys/dev/ic/i82586.c
cvs rdiff -u -r1.65 -r1.65.4.1 src/sys/dev/pcmcia/if_cnw.c
cvs rdiff -u -r1.94 -r1.94.2.1 src/sys/dev/pcmcia/if_ray.c
cvs rdiff -u -r1.35 -r1.35.2.1 src/sys/dev/qbus/if_il.c
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/dev/qbus/if_qt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/ep93xx/epe.c
diff -u src/sys/arch/arm/ep93xx/epe.c:1.44 src/sys/arch/arm/ep93xx/epe.c:1.44.2.1
--- src/sys/arch/arm/ep93xx/epe.c:1.44 Thu May 30 02:32:17 2019
+++ src/sys/arch/arm/ep93xx/epe.c Wed Oct 23 19:43:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: epe.c,v 1.44 2019/05/30 02:32:17 msaitoh Exp $ */
+/* $NetBSD: epe.c,v 1.44.2.1 2019/10/23 19:43:24 martin Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.44 2019/05/30 02:32:17 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.44.2.1 2019/10/23 19:43:24 martin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -256,7 +256,6 @@ begin:
}
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);
Index: src/sys/arch/arm/sunxi/sunxi_can.c
diff -u src/sys/arch/arm/sunxi/sunxi_can.c:1.1 src/sys/arch/arm/sunxi/sunxi_can.c:1.1.8.1
--- src/sys/arch/arm/sunxi/sunxi_can.c:1.1 Wed Mar 7 20:55:31 2018
+++ src/sys/arch/arm/sunxi/sunxi_can.c Wed Oct 23 19:43:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_can.c,v 1.1 2018/03/07 20:55:31 bouyer Exp $ */
+/* $NetBSD: sunxi_can.c,v 1.1.8.1 2019/10/23 19:43:25 martin Exp $ */
/*-
* Copyright (c) 2017,2018 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sunxi_can.c,v 1.1 2018/03/07 20:55:31 bouyer Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sunxi_can.c,v 1.1.8.1 2019/10/23 19:43:25 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -292,7 +292,6 @@ sunxi_can_rx_intr(struct sunxi_can_softc
}
sunxi_can_write(sc, SUNXI_CAN_CMD_REG, SUNXI_CAN_CMD_REL_RX_BUF);
m->m_len = m->m_pkthdr.len = CAN_MTU;
- ifp->if_ipackets++;
ifp->if_ibytes += m->m_len;
m_set_rcvif(m, ifp);
can_bpf_mtap(ifp, m, 1);
Index: src/sys/arch/mac68k/nubus/if_netdock_nubus.c
diff -u src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.29 src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.29.4.1
--- src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.29 Tue Feb 5 06:17:01 2019
+++ src/sys/arch/mac68k/nubus/if_netdock_nubus.c Wed Oct 23 19:43:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_netdock_nubus.c,v 1.29 2019/02/05 06:17:01 msaitoh Exp $ */
+/* $NetBSD: if_netdock_nubus.c,v 1.29.4.1 2019/10/23 19:43:25 martin Exp $ */
/*
* Copyright (C) 2000,2002 Daishi Kato <dai...@axlight.com>
@@ -43,7 +43,7 @@
/***********************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.29 2019/02/05 06:17:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.29.4.1 2019/10/23 19:43:25 martin Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -725,9 +725,7 @@ netdock_rxint(struct netdock_softc *sc)
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++;
Index: src/sys/dev/ic/i82586.c
diff -u src/sys/dev/ic/i82586.c:1.85 src/sys/dev/ic/i82586.c:1.85.2.1
--- src/sys/dev/ic/i82586.c:1.85 Wed May 29 10:07:29 2019
+++ src/sys/dev/ic/i82586.c Wed Oct 23 19:43:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: i82586.c,v 1.85 2019/05/29 10:07:29 msaitoh Exp $ */
+/* $NetBSD: i82586.c,v 1.85.2.1 2019/10/23 19:43:24 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -137,7 +137,7 @@ Mode of operation:
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.85 2019/05/29 10:07:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.85.2.1 2019/10/23 19:43:24 martin Exp $");
#include <sys/param.h>
@@ -1041,7 +1041,6 @@ ie_readframe(
* 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);
}
Index: src/sys/dev/pcmcia/if_cnw.c
diff -u src/sys/dev/pcmcia/if_cnw.c:1.65 src/sys/dev/pcmcia/if_cnw.c:1.65.4.1
--- src/sys/dev/pcmcia/if_cnw.c:1.65 Tue Feb 5 06:17:03 2019
+++ src/sys/dev/pcmcia/if_cnw.c Wed Oct 23 19:43:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cnw.c,v 1.65 2019/02/05 06:17:03 msaitoh Exp $ */
+/* $NetBSD: if_cnw.c,v 1.65.4.1 2019/10/23 19:43:24 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.65 2019/02/05 06:17:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.65.4.1 2019/10/23 19:43:24 martin Exp $");
#include "opt_inet.h"
@@ -848,7 +848,6 @@ cnw_recv(struct cnw_softc *sc)
++ifp->if_ierrors;
return;
}
- ++ifp->if_ipackets;
/* Pass the packet up. */
if_percpuq_enqueue(ifp->if_percpuq, m);
Index: src/sys/dev/pcmcia/if_ray.c
diff -u src/sys/dev/pcmcia/if_ray.c:1.94 src/sys/dev/pcmcia/if_ray.c:1.94.2.1
--- src/sys/dev/pcmcia/if_ray.c:1.94 Tue May 28 07:41:49 2019
+++ src/sys/dev/pcmcia/if_ray.c Wed Oct 23 19:43:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ray.c,v 1.94 2019/05/28 07:41:49 msaitoh Exp $ */
+/* $NetBSD: if_ray.c,v 1.94.2.1 2019/10/23 19:43:24 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.94 2019/05/28 07:41:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.94.2.1 2019/10/23 19:43:24 martin Exp $");
#include "opt_inet.h"
@@ -1518,7 +1518,6 @@ done:
m_adj(m, (char *)eh - (char *)frame);
bpf_mtap(ifp, m, BPF_D_IN);
/* XXX doesn't appear to be included m->m_flags |= M_HASFCS; */
- ifp->if_ipackets++;
if_percpuq_enqueue(ifp->if_percpuq, m);
}
Index: src/sys/dev/qbus/if_il.c
diff -u src/sys/dev/qbus/if_il.c:1.35 src/sys/dev/qbus/if_il.c:1.35.2.1
--- src/sys/dev/qbus/if_il.c:1.35 Tue May 28 07:41:49 2019
+++ src/sys/dev/qbus/if_il.c Wed Oct 23 19:43:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_il.c,v 1.35 2019/05/28 07:41:49 msaitoh Exp $ */
+/* $NetBSD: if_il.c,v 1.35.2.1 2019/10/23 19:43:25 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.35 2019/05/28 07:41:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.35.2.1 2019/10/23 19:43:25 martin Exp $");
#include "opt_inet.h"
@@ -509,7 +509,6 @@ ilrint(void *arg)
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);
Index: src/sys/dev/qbus/if_qt.c
diff -u src/sys/dev/qbus/if_qt.c:1.23 src/sys/dev/qbus/if_qt.c:1.23.8.1
--- src/sys/dev/qbus/if_qt.c:1.23 Tue Jun 26 06:48:02 2018
+++ src/sys/dev/qbus/if_qt.c Wed Oct 23 19:43:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qt.c,v 1.23 2018/06/26 06:48:02 msaitoh Exp $ */
+/* $NetBSD: if_qt.c,v 1.23.8.1 2019/10/23 19:43:25 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.23 2018/06/26 06:48:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.23.8.1 2019/10/23 19:43:25 martin Exp $");
#include "opt_inet.h"
@@ -562,7 +562,6 @@ qtrint(struct qt_softc *sc)
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))
{
