Module Name: src
Committed By: skrll
Date: Tue Feb 4 07:35:34 UTC 2020
Modified Files:
src/sys/arch/arm/at91: at91emac.c
src/sys/arch/arm/gemini: gemini_gmac.c
src/sys/arch/arm/omap: if_cpsw.c
Log Message:
Adopt <net/if_stats.h>
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/at91/at91emac.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/gemini/gemini_gmac.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/omap/if_cpsw.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/at91/at91emac.c
diff -u src/sys/arch/arm/at91/at91emac.c:1.29 src/sys/arch/arm/at91/at91emac.c:1.30
--- src/sys/arch/arm/at91/at91emac.c:1.29 Tue May 28 07:41:46 2019
+++ src/sys/arch/arm/at91/at91emac.c Tue Feb 4 07:35:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: at91emac.c,v 1.29 2019/05/28 07:41:46 msaitoh Exp $ */
+/* $NetBSD: at91emac.c,v 1.30 2020/02/04 07:35:34 skrll Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.29 2019/05/28 07:41:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.30 2020/02/04 07:35:34 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -245,13 +245,13 @@ emac_intr(void *arg)
EMAC_WRITE(ETH_CTL, ctl & ~ETH_CTL_RE); // disable receiver
EMAC_WRITE(ETH_RSR, ETH_RSR_BNA); // clear BNA bit
EMAC_WRITE(ETH_CTL, ctl | ETH_CTL_RE); // re-enable receiver
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
ifp->if_ipackets++;
DPRINTFN(1,("%s: out of receive buffers\n", __FUNCTION__));
}
if (isr & ETH_ISR_ROVR) {
EMAC_WRITE(ETH_RSR, ETH_RSR_OVR); // clear interrupt
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
ifp->if_ipackets++;
DPRINTFN(1,("%s: receive overrun\n", __FUNCTION__));
}
@@ -306,7 +306,7 @@ emac_intr(void *arg)
if (m != NULL) {
m_freem(m);
}
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
}
sc->rxqi++;
}
@@ -587,7 +587,7 @@ emac_tick(void *arg)
int s;
uint32_t misses;
- ifp->if_collisions += EMAC_READ(ETH_SCOL) + EMAC_READ(ETH_MCOL);
+ if_statadd(ifp, if_collisions, EMAC_READ(ETH_SCOL) + EMAC_READ(ETH_MCOL));
/* These misses are ok, they will happen if the RAM/CPU can't keep up */
misses = EMAC_READ(ETH_DRFC);
if (misses > 0)
Index: src/sys/arch/arm/gemini/gemini_gmac.c
diff -u src/sys/arch/arm/gemini/gemini_gmac.c:1.18 src/sys/arch/arm/gemini/gemini_gmac.c:1.19
--- src/sys/arch/arm/gemini/gemini_gmac.c:1.18 Wed Oct 30 10:12:37 2019
+++ src/sys/arch/arm/gemini/gemini_gmac.c Tue Feb 4 07:35:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_gmac.c,v 1.18 2019/10/30 10:12:37 msaitoh Exp $ */
+/* $NetBSD: gemini_gmac.c,v 1.19 2020/02/04 07:35:34 skrll 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.18 2019/10/30 10:12:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_gmac.c,v 1.19 2020/02/04 07:35:34 skrll Exp $");
#define SWFREEQ_DESCS 256 /* one page worth */
#define HWFREEQ_DESCS 256 /* one page worth */
@@ -546,8 +546,8 @@ gmac_hwqueue_txconsume(gmac_hwqueue_t *h
gmac_mapcache_put(hqm->hqm_mc, map);
ifp = hwq->hwq_ifp;
- ifp->if_opackets++;
- ifp->if_obytes += m->m_pkthdr.len;
+ if_statinc(ifp, if_opackets);
+ if_statiadd(ifp, if_obytes, m->m_pkthdr.len);
aprint_debug("gmac_hwqueue_txconsume(%p): %zu@%p: %s m=%p\n",
hwq, d - hwq->hwq_base, d, ifp->if_xname, m);
@@ -859,7 +859,7 @@ gmac_hwqueue_rxconsume(gmac_hwqueue_t *h
if_percpuq_enqueue(ifp->if_percpuq, m);
break;
default:
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
m_freem(m);
break;
}
Index: src/sys/arch/arm/omap/if_cpsw.c
diff -u src/sys/arch/arm/omap/if_cpsw.c:1.27 src/sys/arch/arm/omap/if_cpsw.c:1.28
--- src/sys/arch/arm/omap/if_cpsw.c:1.27 Tue Feb 4 05:15:44 2020
+++ src/sys/arch/arm/omap/if_cpsw.c Tue Feb 4 07:35:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cpsw.c,v 1.27 2020/02/04 05:15:44 thorpej Exp $ */
+/* $NetBSD: if_cpsw.c,v 1.28 2020/02/04 07:35:34 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.27 2020/02/04 05:15:44 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.28 2020/02/04 07:35:34 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -621,7 +621,7 @@ cpsw_start(struct ifnet *ifp)
device_printf(sc->sc_dev, "won't fit\n");
IFQ_DEQUEUE(&ifp->if_snd, m);
m_freem(m);
- ifp->if_oerrors++;
+ if_statinc(ifp, if_oerrors);
continue;
} else if (error != 0) {
device_printf(sc->sc_dev, "error\n");
@@ -731,7 +731,7 @@ cpsw_watchdog(struct ifnet *ifp)
device_printf(sc->sc_dev, "device timeout\n");
- ifp->if_oerrors++;
+ if_statinc(ifp, if_oerrors);
cpsw_init(ifp);
cpsw_start(ifp);
}
@@ -1161,7 +1161,7 @@ cpsw_rxintr(void *arg)
if (cpsw_new_rxbuf(sc, i) != 0) {
/* drop current packet, reuse buffer for new */
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
goto next;
}
@@ -1266,7 +1266,7 @@ cpsw_txintr(void *arg)
m_freem(rdp->tx_mb[sc->sc_txhead]);
rdp->tx_mb[sc->sc_txhead] = NULL;
- ifp->if_opackets++;
+ if_statinc(ifp, if_opackets);
handled = true;
