Module Name: src
Committed By: thorpej
Date: Wed Jan 29 05:35:28 UTC 2020
Modified Files:
src/sys/arch/powerpc/booke/dev: pq3etsec.c
src/sys/arch/powerpc/ibm4xx/dev: if_emac.c
Log Message:
Adopt <net/if_stats.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/powerpc/ibm4xx/dev/if_emac.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/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.47 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.48
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.47 Wed Oct 30 10:12:37 2019
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c Wed Jan 29 05:35:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3etsec.c,v 1.47 2019/10/30 10:12:37 msaitoh Exp $ */
+/* $NetBSD: pq3etsec.c,v 1.48 2020/01/29 05:35:28 thorpej 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.47 2019/10/30 10:12:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.48 2020/01/29 05:35:28 thorpej Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -1683,7 +1683,7 @@ pq3etsec_rxq_consume(
* We encountered an error, take the mbufs and add
* then to the rx bufcache so we can reuse them.
*/
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
for (m = rxq->rxq_mhead;
m != rxq->rxq_mconsumer;
m = m->m_next) {
@@ -2226,12 +2226,14 @@ pq3etsec_txq_consume(
if (m->m_flags & M_HASFCB)
m_adj(m, sizeof(struct txfcb));
bpf_mtap(ifp, m, BPF_D_OUT);
- ifp->if_opackets++;
- ifp->if_obytes += m->m_pkthdr.len;
+ net_stats_ref_t nsr = IF_STAT_GETREF(ifp);
+ if_statinc_ref(nsr, if_opackets);
+ if_statadd_ref(nsr, if_obytes, m->m_pkthdr.len);
if (m->m_flags & M_MCAST)
- ifp->if_omcasts++;
+ if_statinc_ref(nsr, if_omcasts);
if (txbd_flags & TXBD_ERRORS)
- ifp->if_oerrors++;
+ if_statinc_ref(nsr, if_oerrors);
+ IF_STAT_PUTREF(ifp);
m_freem(m);
#ifdef ETSEC_DEBUG
txq->txq_lmbufs[consumer - txq->txq_first] = NULL;
Index: src/sys/arch/powerpc/ibm4xx/dev/if_emac.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/if_emac.c:1.51 src/sys/arch/powerpc/ibm4xx/dev/if_emac.c:1.52
--- src/sys/arch/powerpc/ibm4xx/dev/if_emac.c:1.51 Tue May 28 07:41:48 2019
+++ src/sys/arch/powerpc/ibm4xx/dev/if_emac.c Wed Jan 29 05:35:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_emac.c,v 1.51 2019/05/28 07:41:48 msaitoh Exp $ */
+/* $NetBSD: if_emac.c,v 1.52 2020/01/29 05:35:28 thorpej Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.51 2019/05/28 07:41:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.52 2020/01/29 05:35:28 thorpej Exp $");
#include "opt_emac.h"
@@ -1108,7 +1108,7 @@ emac_watchdog(struct ifnet *ifp)
aprint_error_ifnet(ifp,
"device timeout (txfree %d txsfree %d txnext %d)\n",
sc->sc_txfree, sc->sc_txsfree, sc->sc_txnext);
- ifp->if_oerrors++;
+ if_statinc(ifp, if_oerrors);
/* Reset the interface. */
(void)emac_init(ifp);
@@ -1281,7 +1281,7 @@ emac_txreap(struct emac_softc *sc)
* Check for errors and collisions.
*/
if (txstat & (EMAC_TXS_UR | EMAC_TXS_ED))
- ifp->if_oerrors++;
+ if_statinc(ifp, if_oerrors);
#ifdef EMAC_EVENT_COUNTERS
if (txstat & EMAC_TXS_UR)
@@ -1291,15 +1291,15 @@ emac_txreap(struct emac_softc *sc)
if (txstat &
(EMAC_TXS_EC | EMAC_TXS_MC | EMAC_TXS_SC | EMAC_TXS_LC)) {
if (txstat & EMAC_TXS_EC)
- ifp->if_collisions += 16;
+ if_statadd(ifp, if_collisions, 16);
else if (txstat & EMAC_TXS_MC)
- ifp->if_collisions += 2; /* XXX? */
+ if_statadd(ifp, if_collisions, 2); /* XXX? */
else if (txstat & EMAC_TXS_SC)
- ifp->if_collisions++;
+ if_statinc(ifp, if_collisions);
if (txstat & EMAC_TXS_LC)
- ifp->if_collisions++;
+ if_statinc(ifp, if_collisions);
} else
- ifp->if_opackets++;
+ if_statinc(ifp, if_opackets);
if (ifp->if_flags & IFF_DEBUG) {
if (txstat & EMAC_TXS_ED)
@@ -1615,7 +1615,7 @@ emac_rxeob_intr(void *arg)
if (rxstat & (bit)) \
aprint_error_ifnet(ifp, \
"receive error: %s\n", str)
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
PRINTERR(EMAC_RXS_OE, "overrun error");
PRINTERR(EMAC_RXS_BP, "bad packet");
PRINTERR(EMAC_RXS_RP, "runt packet");
@@ -1664,7 +1664,7 @@ emac_rxeob_intr(void *arg)
m = rxs->rxs_mbuf;
if (emac_add_rxbuf(sc, i) != 0) {
dropit:
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
EMAC_INIT_RXDESC(sc, i);
bus_dmamap_sync(sc->sc_dmat,
rxs->rxs_dmamap, 0,
