Module Name: src
Committed By: thorpej
Date: Wed Jan 29 05:25:42 UTC 2020
Modified Files:
src/sys/arch/mac68k/dev: if_mc.c
src/sys/arch/mac68k/nubus: if_netdock_nubus.c
Log Message:
Adopt <net/if_stats.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/mac68k/dev/if_mc.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/mac68k/nubus/if_netdock_nubus.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/mac68k/dev/if_mc.c
diff -u src/sys/arch/mac68k/dev/if_mc.c:1.52 src/sys/arch/mac68k/dev/if_mc.c:1.53
--- src/sys/arch/mac68k/dev/if_mc.c:1.52 Fri Dec 27 09:32:09 2019
+++ src/sys/arch/mac68k/dev/if_mc.c Wed Jan 29 05:25:41 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mc.c,v 1.52 2019/12/27 09:32:09 msaitoh Exp $ */
+/* $NetBSD: if_mc.c,v 1.53 2020/01/29 05:25:41 thorpej Exp $ */
/*-
* Copyright (c) 1997 David Huang <k...@azeotrope.org>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.52 2019/12/27 09:32:09 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.53 2020/01/29 05:25:41 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -266,7 +266,7 @@ mcstart(struct ifnet *ifp)
ifp->if_flags |= IFF_OACTIVE;
maceput(sc, m);
- ifp->if_opackets++; /* # of pkts */
+ if_statinc(ifp, if_opackets); /* # of pkts */
}
}
@@ -434,21 +434,21 @@ struct mc_softc *sc = arg;
#ifdef MCDEBUG
printf("%s: jabber error\n", device_xname(sc->sc_dev));
#endif
- sc->sc_if.if_oerrors++;
+ if_statinc(&sc->sc_if, if_oerrors);
}
if (ir & BABL) {
#ifdef MCDEBUG
printf("%s: babble\n", device_xname(sc->sc_dev));
#endif
- sc->sc_if.if_oerrors++;
+ if_statinc(&sc->sc_if, if_oerrors);
}
if (ir & CERR) {
#ifdef MCDEBUG
printf("%s: collision error\n", device_xname(sc->sc_dev));
#endif
- sc->sc_if.if_collisions++;
+ if_statinc(&sc->sc_if, if_collisions);
}
/*
@@ -481,29 +481,33 @@ mc_tint(struct mc_softc *sc)
return;
}
+ net_stat_ref_t nsr = IF_STAT_GETREF(&sc->sc_if);
+
if (xmtfs & LCOL) {
printf("%s: late collision\n", device_xname(sc->sc_dev));
- sc->sc_if.if_oerrors++;
- sc->sc_if.if_collisions++;
+ if_statinc_ref(nsr, if_oerrors);
+ if_statinc_ref(nsr, if_collisions);
}
if (xmtfs & MORE)
/* Real number is unknown. */
- sc->sc_if.if_collisions += 2;
+ if_statadd_ref(nsr, if_collsions, 2);
else if (xmtfs & ONE)
- sc->sc_if.if_collisions++;
+ if_statinc_ref(nsr, if_collisions);
else if (xmtfs & RTRY) {
printf("%s: excessive collisions\n", device_xname(sc->sc_dev));
- sc->sc_if.if_collisions += 16;
- sc->sc_if.if_oerrors++;
+ if_statadd_ref(nsr, if_collsions, 16);
+ if_statinc_ref(nsr, if_oerrors);
}
if (xmtfs & LCAR) {
sc->sc_havecarrier = 0;
printf("%s: lost carrier\n", device_xname(sc->sc_dev));
- sc->sc_if.if_oerrors++;
+ if_statinc_ref(nsr, if_oerrors);
}
+ IF_STAT_PUTREF(&sc->sc_if);
+
sc->sc_if.if_flags &= ~IFF_OACTIVE;
sc->sc_if.if_timer = 0;
if_schedule_deferred_start(&sc->sc_if);
@@ -526,18 +530,18 @@ mc_rint(struct mc_softc *sc)
if (rxf.rx_rcvsts & OFLO) {
printf("%s: receive FIFO overflow\n", device_xname(sc->sc_dev));
- sc->sc_if.if_ierrors++;
+ if_statinc(&sc->sc_if, if_ierrors);
return;
}
if (rxf.rx_rcvsts & CLSN)
- sc->sc_if.if_collisions++;
+ if_statinc(&sc->sc_if, if_collisions);
if (rxf.rx_rcvsts & FRAM) {
#ifdef MCDEBUG
printf("%s: framing error\n", device_xname(sc->sc_dev));
#endif
- sc->sc_if.if_ierrors++;
+ if_statinc(&sc->sc_if, if_ierrors);
return;
}
@@ -545,7 +549,7 @@ mc_rint(struct mc_softc *sc)
#ifdef MCDEBUG
printf("%s: frame control checksum error\n", device_xname(sc->sc_dev));
#endif
- sc->sc_if.if_ierrors++;
+ if_statinc(&sc->sc_if, if_ierrors);
return;
}
@@ -565,13 +569,13 @@ mace_read(struct mc_softc *sc, void *pkt
printf("%s: invalid packet size %d; dropping\n",
device_xname(sc->sc_dev), len);
#endif
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
return;
}
m = mace_get(sc, pkt, len);
if (m == NULL) {
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
return;
}
Index: src/sys/arch/mac68k/nubus/if_netdock_nubus.c
diff -u src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.31 src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.32
--- src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.31 Mon Oct 21 08:22:06 2019
+++ src/sys/arch/mac68k/nubus/if_netdock_nubus.c Wed Jan 29 05:25:42 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_netdock_nubus.c,v 1.31 2019/10/21 08:22:06 msaitoh Exp $ */
+/* $NetBSD: if_netdock_nubus.c,v 1.32 2020/01/29 05:25:42 thorpej 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.31 2019/10/21 08:22:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.32 2020/01/29 05:25:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -458,7 +458,7 @@ netdock_start(struct ifnet *ifp)
return;
}
- ifp->if_opackets++;
+ if_statinc(ifp, if_opackets);
}
}
@@ -726,9 +726,9 @@ netdock_rxint(struct netdock_softc *sc)
if ((regdata1 & 0x00ac) == 0) {
if (netdock_read(sc, len) == 0)
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
} else {
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
if (regdata1 & REG_DATA_BIT_02)
NIC_GET_4(sc, REG_EFD00);
