Module Name: src
Committed By: thorpej
Date: Wed Jan 29 06:17:07 UTC 2020
Modified Files:
src/sys/dev/ic: am7990.c lance.c
Log Message:
Adopt <net/if_stats.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/ic/am7990.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/ic/lance.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/dev/ic/am7990.c
diff -u src/sys/dev/ic/am7990.c:1.80 src/sys/dev/ic/am7990.c:1.81
--- src/sys/dev/ic/am7990.c:1.80 Thu Nov 28 05:07:27 2019
+++ src/sys/dev/ic/am7990.c Wed Jan 29 06:17:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: am7990.c,v 1.80 2019/11/28 05:07:27 isaki Exp $ */
+/* $NetBSD: am7990.c,v 1.81 2020/01/29 06:17:07 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1.80 2019/11/28 05:07:27 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1.81 2020/01/29 06:17:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -242,12 +242,12 @@ am7990_rint(struct lance_softc *sc)
if (rmd.rmd1_bits & LE_R1_BUFF)
printf("%s: receive buffer error\n",
device_xname(sc->sc_dev));
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
} else if ((rmd.rmd1_bits & (LE_R1_STP | LE_R1_ENP)) !=
(LE_R1_STP | LE_R1_ENP)) {
printf("%s: dropping chained buffer\n",
device_xname(sc->sc_dev));
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
} else {
#ifdef LEDEBUG
if (sc->sc_debug > 1)
@@ -328,23 +328,23 @@ am7990_tint(struct lance_softc *sc)
device_xname(sc->sc_dev));
}
if (tmd.tmd3 & LE_T3_LCOL)
- ifp->if_collisions++;
+ if_statinc(ifp, if_collisions);
if (tmd.tmd3 & LE_T3_RTRY) {
#ifdef LEDEBUG
printf("%s: excessive collisions, tdr %d\n",
device_xname(sc->sc_dev),
tmd.tmd3 & LE_T3_TDR_MASK);
#endif
- ifp->if_collisions += 16;
+ if_statadd(ifp, if_collisions, 16);
}
- ifp->if_oerrors++;
+ if_statinc(ifp, if_oerrors);
} else {
if (tmd.tmd1_bits & LE_T1_ONE)
- ifp->if_collisions++;
+ if_statinc(ifp, if_collisions);
else if (tmd.tmd1_bits & LE_T1_MORE)
/* Real number is unknown. */
- ifp->if_collisions += 2;
- ifp->if_opackets++;
+ if_statadd(ifp, if_collisions, 2);
+ if_statinc(ifp, if_opackets);
}
if (++bix == sc->sc_ntbuf)
@@ -398,20 +398,20 @@ am7990_intr(void *arg)
#ifdef LEDEBUG
printf("%s: babble\n", device_xname(sc->sc_dev));
#endif
- ifp->if_oerrors++;
+ if_statinc(ifp, if_oerrors);
}
#if 0
if (isr & LE_C0_CERR) {
printf("%s: collision error\n",
device_xname(sc->sc_dev));
- ifp->if_collisions++;
+ if_statinc(ifp, if_collisions);
}
#endif
if (isr & LE_C0_MISS) {
#ifdef LEDEBUG
printf("%s: missed packet\n", device_xname(sc->sc_dev));
#endif
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
}
if (isr & LE_C0_MERR) {
printf("%s: memory error\n", device_xname(sc->sc_dev));
@@ -422,13 +422,13 @@ am7990_intr(void *arg)
if ((isr & LE_C0_RXON) == 0) {
printf("%s: receiver disabled\n", device_xname(sc->sc_dev));
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
lance_reset(sc);
return (1);
}
if ((isr & LE_C0_TXON) == 0) {
printf("%s: transmitter disabled\n", device_xname(sc->sc_dev));
- ifp->if_oerrors++;
+ if_statinc(ifp, if_oerrors);
lance_reset(sc);
return (1);
}
Index: src/sys/dev/ic/lance.c
diff -u src/sys/dev/ic/lance.c:1.59 src/sys/dev/ic/lance.c:1.60
--- src/sys/dev/ic/lance.c:1.59 Fri Dec 27 09:32:10 2019
+++ src/sys/dev/ic/lance.c Wed Jan 29 06:17:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lance.c,v 1.59 2019/12/27 09:32:10 msaitoh Exp $ */
+/* $NetBSD: lance.c,v 1.60 2020/01/29 06:17:07 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.59 2019/12/27 09:32:10 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.60 2020/01/29 06:17:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -430,14 +430,14 @@ lance_read(struct lance_softc *sc, int b
printf("%s: invalid packet size %d; dropping\n",
device_xname(sc->sc_dev), len);
#endif
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
return;
}
/* Pull packet off interface. */
m = lance_get(sc, boff, len);
if (m == 0) {
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
return;
}
@@ -479,7 +479,7 @@ lance_watchdog(struct ifnet *ifp)
struct lance_softc *sc = ifp->if_softc;
log(LOG_ERR, "%s: device timeout\n", device_xname(sc->sc_dev));
- ++ifp->if_oerrors;
+ if_statinc(ifp, if_oerrors);
lance_reset(sc);
}
