Module Name: src
Committed By: msaitoh
Date: Wed Oct 30 10:12:37 UTC 2019
Modified Files:
src/sys/arch/arm/broadcom: bcm53xx_eth.c
src/sys/arch/arm/gemini: gemini_gmac.c if_gpn.c
src/sys/arch/powerpc/booke/dev: pq3etsec.c
src/sys/dev/pcmcia: if_xi.c
Log Message:
ether_input() automatically add input bytes to if_ibytes, so it's not
required to do in the driver who use ether_input().
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/broadcom/bcm53xx_eth.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/gemini/gemini_gmac.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/gemini/if_gpn.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.90 -r1.91 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.39
--- 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 Oct 30 10:12:37 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.39 2019/10/30 10:12:37 msaitoh 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.18
--- 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 Oct 30 10:12:37 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.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 @@ 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.13
--- 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 Oct 30 10:12:37 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.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 @@ 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.47
--- 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 Oct 30 10:12:37 2019
@@ -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 @@ 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/pcmcia/if_xi.c
diff -u src/sys/dev/pcmcia/if_xi.c:1.90 src/sys/dev/pcmcia/if_xi.c:1.91
--- src/sys/dev/pcmcia/if_xi.c:1.90 Tue May 28 07:41:49 2019
+++ src/sys/dev/pcmcia/if_xi.c Wed Oct 30 10:12:37 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.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 @@ 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);
}
