Module Name: src
Committed By: martin
Date: Wed Nov 6 09:59:39 UTC 2019
Modified Files:
src/sys/arch/arm/broadcom [netbsd-9]: bcm53xx_eth.c
src/sys/arch/arm/gemini [netbsd-9]: gemini_gmac.c if_gpn.c
src/sys/arch/powerpc/booke/dev [netbsd-9]: pq3etsec.c
src/sys/dev/ic [netbsd-9]: aic6915.c elinkxl.c i82557.c
src/sys/dev/pci [netbsd-9]: if_age.c if_alc.c if_ale.c if_ste.c
if_stge.c if_tl.c if_txp.c if_vte.c
src/sys/dev/pcmcia [netbsd-9]: if_xi.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.2.1 src/sys/arch/arm/broadcom/bcm53xx_eth.c
cvs rdiff -u -r1.17 -r1.17.4.1 src/sys/arch/arm/gemini/gemini_gmac.c
cvs rdiff -u -r1.12 -r1.12.2.1 src/sys/arch/arm/gemini/if_gpn.c
cvs rdiff -u -r1.46 -r1.46.2.1 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.39 -r1.39.2.1 src/sys/dev/ic/aic6915.c
cvs rdiff -u -r1.131 -r1.131.2.1 src/sys/dev/ic/elinkxl.c
cvs rdiff -u -r1.154.2.1 -r1.154.2.2 src/sys/dev/ic/i82557.c
cvs rdiff -u -r1.60.2.1 -r1.60.2.2 src/sys/dev/pci/if_age.c
cvs rdiff -u -r1.38.2.1 -r1.38.2.2 src/sys/dev/pci/if_alc.c
cvs rdiff -u -r1.33 -r1.33.2.1 src/sys/dev/pci/if_ale.c
cvs rdiff -u -r1.56 -r1.56.2.1 src/sys/dev/pci/if_ste.c
cvs rdiff -u -r1.70 -r1.70.2.1 src/sys/dev/pci/if_stge.c
cvs rdiff -u -r1.116 -r1.116.2.1 src/sys/dev/pci/if_tl.c
cvs rdiff -u -r1.59 -r1.59.2.1 src/sys/dev/pci/if_txp.c
cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/dev/pci/if_vte.c
cvs rdiff -u -r1.90 -r1.90.2.1 src/sys/dev/pcmcia/if_xi.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/broadcom/bcm53xx_eth.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.38 src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.38.2.1
--- src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.38 Wed May 29 13:25:54 2019
+++ src/sys/arch/arm/broadcom/bcm53xx_eth.c Wed Nov 6 09:59:38 2019
@@ -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 @@ bcmeth_rx_input(
}
m_set_rcvif(m, ifp);
- ifp->if_ibytes += m->m_pkthdr.len;
-
/*
* Let's give it to the network subsystm to deal with.
*/
Index: src/sys/arch/arm/gemini/gemini_gmac.c
diff -u src/sys/arch/arm/gemini/gemini_gmac.c:1.17 src/sys/arch/arm/gemini/gemini_gmac.c:1.17.4.1
--- src/sys/arch/arm/gemini/gemini_gmac.c:1.17 Tue Jan 22 03:42:25 2019
+++ src/sys/arch/arm/gemini/gemini_gmac.c Wed Nov 6 09:59:39 2019
@@ -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 @@ gmac_hwqueue_rxconsume(gmac_hwqueue_t *h
*/
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:
Index: src/sys/arch/arm/gemini/if_gpn.c
diff -u src/sys/arch/arm/gemini/if_gpn.c:1.12 src/sys/arch/arm/gemini/if_gpn.c:1.12.2.1
--- src/sys/arch/arm/gemini/if_gpn.c:1.12 Wed May 29 10:07:28 2019
+++ src/sys/arch/arm/gemini/if_gpn.c Wed Nov 6 09:59:39 2019
@@ -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 @@ gpn_process_data(struct gpn_softc *sc, c
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));
Index: src/sys/arch/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.46 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.46.2.1
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.46 Tue Jul 9 08:46:58 2019
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c Wed Nov 6 09:59:39 2019
@@ -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 @@ pq3etsec_rx_input(
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.
*/
Index: src/sys/dev/ic/aic6915.c
diff -u src/sys/dev/ic/aic6915.c:1.39 src/sys/dev/ic/aic6915.c:1.39.2.1
--- src/sys/dev/ic/aic6915.c:1.39 Tue May 28 07:41:48 2019
+++ src/sys/dev/ic/aic6915.c Wed Nov 6 09:59:38 2019
@@ -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 @@ sf_stats_update(struct sf_softc *sc)
stats.TransmitAbortDueToExcessingDeferral +
stats.FramesLostDueToInternalTransmitErrors;
- ifp->if_ipackets += stats.ReceiveOKFrames;
-
ifp->if_ierrors += stats.ReceiveCRCErrors + stats.AlignmentErrors +
stats.ReceiveFramesTooLong + stats.ReceiveFramesTooShort +
stats.ReceiveFramesJabbersError +
Index: src/sys/dev/ic/elinkxl.c
diff -u src/sys/dev/ic/elinkxl.c:1.131 src/sys/dev/ic/elinkxl.c:1.131.2.1
--- src/sys/dev/ic/elinkxl.c:1.131 Tue May 28 07:41:48 2019
+++ src/sys/dev/ic/elinkxl.c Wed Nov 6 09:59:38 2019
@@ -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 @@ ex_getstats(struct ex_softc *sc)
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);
Index: src/sys/dev/ic/i82557.c
diff -u src/sys/dev/ic/i82557.c:1.154.2.1 src/sys/dev/ic/i82557.c:1.154.2.2
--- src/sys/dev/ic/i82557.c:1.154.2.1 Sun Sep 22 12:13:33 2019
+++ src/sys/dev/ic/i82557.c Wed Nov 6 09:59:38 2019
@@ -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 @@ fxp_tick(void *arg)
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++;
Index: src/sys/dev/pci/if_age.c
diff -u src/sys/dev/pci/if_age.c:1.60.2.1 src/sys/dev/pci/if_age.c:1.60.2.2
--- src/sys/dev/pci/if_age.c:1.60.2.1 Sun Sep 22 12:15:28 2019
+++ src/sys/dev/pci/if_age.c Wed Nov 6 09:59:39 2019
@@ -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 @@ age_stats_update(struct age_softc *sc)
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 +
Index: src/sys/dev/pci/if_alc.c
diff -u src/sys/dev/pci/if_alc.c:1.38.2.1 src/sys/dev/pci/if_alc.c:1.38.2.2
--- src/sys/dev/pci/if_alc.c:1.38.2.1 Thu Oct 24 16:23:17 2019
+++ src/sys/dev/pci/if_alc.c Wed Nov 6 09:59:38 2019
@@ -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 <yong...@freebsd.org>
@@ -2276,8 +2276,6 @@ alc_stats_update(struct alc_softc *sc)
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 +
Index: src/sys/dev/pci/if_ale.c
diff -u src/sys/dev/pci/if_ale.c:1.33 src/sys/dev/pci/if_ale.c:1.33.2.1
--- src/sys/dev/pci/if_ale.c:1.33 Tue Jul 9 08:46:59 2019
+++ src/sys/dev/pci/if_ale.c Wed Nov 6 09:59:39 2019
@@ -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 <yong...@freebsd.org>
@@ -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 @@ ale_stats_update(struct ale_softc *sc)
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 +
Index: src/sys/dev/pci/if_ste.c
diff -u src/sys/dev/pci/if_ste.c:1.56 src/sys/dev/pci/if_ste.c:1.56.2.1
--- src/sys/dev/pci/if_ste.c:1.56 Tue May 28 07:41:49 2019
+++ src/sys/dev/pci/if_ste.c Wed Nov 6 09:59:38 2019
@@ -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 @@ ste_stats_update(struct ste_softc *sc)
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) +
Index: src/sys/dev/pci/if_stge.c
diff -u src/sys/dev/pci/if_stge.c:1.70 src/sys/dev/pci/if_stge.c:1.70.2.1
--- src/sys/dev/pci/if_stge.c:1.70 Tue Jul 9 08:46:59 2019
+++ src/sys/dev/pci/if_stge.c Wed Nov 6 09:59:39 2019
@@ -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 @@ stge_stats_update(struct stge_softc *sc)
(void) bus_space_read_4(st, sh, STGE_OctetRcvOk);
- ifp->if_ipackets +=
- bus_space_read_4(st, sh, STGE_FramesRcvdOk);
+ (void) bus_space_read_4(st, sh, STGE_FramesRcvdOk);
ifp->if_ierrors +=
(u_int) bus_space_read_2(st, sh, STGE_FramesLostRxErrors);
Index: src/sys/dev/pci/if_tl.c
diff -u src/sys/dev/pci/if_tl.c:1.116 src/sys/dev/pci/if_tl.c:1.116.2.1
--- src/sys/dev/pci/if_tl.c:1.116 Tue May 28 07:41:49 2019
+++ src/sys/dev/pci/if_tl.c Wed Nov 6 09:59:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tl.c,v 1.116 2019/05/28 07:41:49 msaitoh Exp $ */
+/* $NetBSD: if_tl.c,v 1.116.2.1 2019/11/06 09:59:38 martin Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.116 2019/05/28 07:41:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.116.2.1 2019/11/06 09:59:38 martin Exp $");
#undef TLDEBUG
#define TL_PRIV_STATS
@@ -1527,7 +1527,6 @@ tl_read_stats(tl_softc_t *sc)
oerr_underr = reg >> 24;
reg = tl_intreg_read(sc, TL_INT_STATS_RX);
- ifp->if_ipackets += reg & 0x00ffffff;
ierr_overr = reg >> 24;
reg = tl_intreg_read(sc, TL_INT_STATS_FERR);
Index: src/sys/dev/pci/if_txp.c
diff -u src/sys/dev/pci/if_txp.c:1.59 src/sys/dev/pci/if_txp.c:1.59.2.1
--- src/sys/dev/pci/if_txp.c:1.59 Tue Jul 9 08:46:59 2019
+++ src/sys/dev/pci/if_txp.c Wed Nov 6 09:59:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_txp.c,v 1.59 2019/07/09 08:46:59 msaitoh Exp $ */
+/* $NetBSD: if_txp.c,v 1.59.2.1 2019/11/06 09:59:39 martin Exp $ */
/*
* Copyright (c) 2001
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.59 2019/07/09 08:46:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.59.2.1 2019/11/06 09:59:39 martin Exp $");
#include "opt_inet.h"
@@ -1373,7 +1373,6 @@ txp_tick(void *vsc)
ifp->if_collisions += ext[0].ext_2 + ext[0].ext_3 + ext[1].ext_2 +
ext[1].ext_3;
ifp->if_opackets += rsp->rsp_par2;
- ifp->if_ipackets += ext[2].ext_3;
out:
if (rsp != NULL)
Index: src/sys/dev/pci/if_vte.c
diff -u src/sys/dev/pci/if_vte.c:1.26 src/sys/dev/pci/if_vte.c:1.26.2.1
--- src/sys/dev/pci/if_vte.c:1.26 Tue May 28 07:41:49 2019
+++ src/sys/dev/pci/if_vte.c Wed Nov 6 09:59:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vte.c,v 1.26 2019/05/28 07:41:49 msaitoh Exp $ */
+/* $NetBSD: if_vte.c,v 1.26.2.1 2019/11/06 09:59:39 martin Exp $ */
/*
* Copyright (c) 2011 Manuel Bouyer. All rights reserved.
@@ -55,7 +55,7 @@
/* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.26 2019/05/28 07:41:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.26.2.1 2019/11/06 09:59:39 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -946,7 +946,6 @@ vte_stats_update(struct vte_softc *sc)
/* Update ifp counters. */
ifp->if_opackets = stat->tx_frames;
ifp->if_oerrors = stat->tx_late_colls + stat->tx_underruns;
- ifp->if_ipackets = stat->rx_frames;
ifp->if_ierrors = stat->rx_crcerrs + stat->rx_runts +
stat->rx_long_frames + stat->rx_fifo_full;
}
Index: src/sys/dev/pcmcia/if_xi.c
diff -u src/sys/dev/pcmcia/if_xi.c:1.90 src/sys/dev/pcmcia/if_xi.c:1.90.2.1
--- src/sys/dev/pcmcia/if_xi.c:1.90 Tue May 28 07:41:49 2019
+++ src/sys/dev/pcmcia/if_xi.c Wed Nov 6 09:59:38 2019
@@ -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.90.2.1 2019/11/06 09:59:38 martin 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.90.2.1 2019/11/06 09:59:38 martin Exp $");
#include "opt_inet.h"
@@ -330,7 +330,6 @@ xi_intr(void *arg)
}
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);
}
