 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ec.c,v 1.34 2019/05/29 10:07:29 msaitoh Exp $	*/
+/*	$NetBSD: if_ec.c,v 1.35 2020/01/29 05:39:48 thorpej Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthew Fredette.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * 3Com 3C400 device driver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.34 2019/05/29 10:07:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.35 2020/01/29 05:39:48 thorpej Exp $");
 #include "opt_inet.h"
 #include "opt_ns.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 @@ -409,37 +409,37 @@ ec_intr(void *arg)
 		/* Receive a packet. */
 		if (recv_second)
 			ec_recv(sc, recv_second);
 		retval++;
+	}
 	/* Check for a transmitted packet. */
 	if (ifp->if_flags & IFF_OACTIVE) {
 		/* If we got a collision. */
 		if (ECREG_CSR_RD & EC_CSR_JAM) {
 			ECREG_CSR_WR(ECREG_CSR_RD &
 			    (EC_CSR_BINT | EC_CSR_AINT | EC_CSR_PAMASK));
-			sc->sc_ethercom.ec_if.if_collisions++;
+			if_statinc(ifp, if_collisions);
 			retval++;
 			ec_coll(sc);
+		}
 		/* If we transmitted a packet. */
 		else if ((ECREG_CSR_RD & EC_CSR_TBSW) == 0) {
 			ECREG_CSR_WR(ECREG_CSR_RD &
 			    (EC_CSR_BINT | EC_CSR_AINT | EC_CSR_PAMASK));
 			retval++;
-			sc->sc_ethercom.ec_if.if_opackets++;
+			if_statinc(ifp, if_opackets);
 			sc->sc_jammed = 0;
 			ifp->if_flags &= ~IFF_OACTIVE;
 			if_schedule_deferred_start(ifp);
+		}
 	} else {
 		/* Make sure we disable transmitter interrupts. */
 		ECREG_CSR_WR(ECREG_CSR_RD &
 		    (EC_CSR_BINT | EC_CSR_AINT | EC_CSR_PAMASK));
+	}
 	return retval;
+}
 @@ -516,27 +516,27 @@ ec_recv(struct ec_softc *sc, int intbit)
+			}
+		}
 		break;
+	}
 	if (total_length == 0) {
 		/* Pass the packet up. */
 		if_percpuq_enqueue(ifp->if_percpuq, m0);
 	} else {
 		/* Something went wrong. */
 		if (m0 != NULL)
 			m_freem(m0);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
+	}
 	/* Give the receive buffer back to the card. */
 	buf = EC_CSR_INT_BUF(intbit);
 	bus_space_write_2(sc->sc_iot, sc->sc_ioh, buf, 0);
 	ECREG_CSR_WR((ECREG_CSR_RD & EC_CSR_INTPA) |
 	    EC_CSR_INT_BSW(intbit) | intbit);
+}
 int
 ec_mediachange(struct ifnet *ifp)
+{
 @@ -619,27 +619,27 @@ ec_ioctl(struct ifnet *ifp, u_long cmd,
 	return error;
+}
 /*
  * Collision routine.
  */
 void
 ec_coll(struct ec_softc *sc)
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	u_short jams;
 	if ((++sc->sc_colliding) >= EC_COLLISIONS_JAMMED) {
-		sc->sc_ethercom.ec_if.if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		if (!sc->sc_jammed)
 			printf("%s: ethernet jammed\n",
 			    device_xname(sc->sc_dev));
 		sc->sc_jammed = 1;
 		sc->sc_colliding = 0;
 		ifp->if_flags &= ~IFF_OACTIVE;
 		if_schedule_deferred_start(ifp);
 	} else {
 		jams = MAX(sc->sc_colliding, EC_BACKOFF_PRNG_COLL_MAX);
 		sc->sc_backoff_seed =
 		    ((sc->sc_backoff_seed * EC_BACKOFF_PRNG_MUL) +
 		    EC_BACKOFF_PRNG_ADD) & EC_BACKOFF_PRNG_MASK;
 		bus_space_write_2(sc->sc_iot, sc->sc_ioh, ECREG_BACKOFF,
 @@ -648,17 +648,17 @@ ec_coll(struct ec_softc *sc)
 		    EC_CSR_JAM | EC_CSR_TINT | EC_CSR_JINT);
+	}
+}
 /*
  * Device timeout routine.
  */
 void
 ec_watchdog(struct ifnet *ifp)
+{
 	struct ec_softc *sc = ifp->if_softc;
 	log(LOG_ERR, "%s: device timeout\n", device_xname(sc->sc_dev));
-	sc->sc_ethercom.ec_if.if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	ec_reset(ifp);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ie.c,v 1.70 2019/05/28 07:41:48 msaitoh Exp $ */
+/*	$NetBSD: if_ie.c,v 1.71 2020/01/29 05:39:48 thorpej Exp $ */
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles M. Hannum.
  * Copyright (c) 1992, 1993, University of Vermont and State
  *  Agricultural College.
  * Copyright (c) 1992, 1993, Garrett A. Wollman.
+ *
  * Portions:
  * Copyright (c) 1994, 1995, Rafal K. Boni
  * Copyright (c) 1990, 1991, William F. Jolitz
  * Copyright (c) 1990, The Regents of the University of California
+ *
  * All rights reserved.
 @@ -88,27 +88,27 @@
    buffer rather than being split off into various fields in the RFD.
    This also means that we must include this header in the transmit
    buffer as well.
    By convention, all transmit commands, and only transmit commands,
    shall have the I (IE_CMD_INTR) bit set in the command.  This way,
    when an interrupt arrives at ieintr(), it is immediately possible
    to tell what precisely caused it.  ANY OTHER command-sending
    routines should run at splnet(), and should post an acknowledgement
    to every interrupt they generate.
 */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.70 2019/05/28 07:41:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.71 2020/01/29 05:39:48 thorpej Exp $");
 #include "opt_inet.h"
 #include "opt_ns.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 @@ -422,27 +422,27 @@ ie_setupram(struct ie_softc *sc)
 	return 1;
+}
 /*
  * Device timeout/watchdog routine.  Entered if the device neglects to
  * generate an interrupt after a transmit has been started on it.
  */
 static void
 iewatchdog(struct ifnet *ifp)
+{
 	struct ie_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);
 	iereset(sc);
+}
 /*
  * What to do upon receipt of an interrupt.
  */
 int
 ie_intr(void *arg)
+{
 	struct ie_softc *sc = arg;
 	uint16_t status;
 	int loopcnt;
 @@ -494,27 +494,27 @@ ie_intr(void *arg)
 #endif
+	}
 	/*
 	 * Receiver not ready (RNR) just means it has
 	 * run out of resources (buffers or frames).
 	 * One can easily cause this with (i.e.) spray.
 	 * This is not a serious error, so be silent.
 	 */
 	if (status & IE_ST_RNR) {
 #ifdef IEDEBUG
 		printf("%s: receiver not ready\n", device_xname(sc->sc_dev));
 #endif
-		sc->sc_if.if_ierrors++;
+		if_statinc(&sc->sc_if, if_ierrors);
 		iereset(sc);
+	}
 #ifdef IEDEBUG
 	if ((status & IE_ST_ALLDONE) && (sc->sc_debug & IED_CNA))
 		printf("%s: cna\n", device_xname(sc->sc_dev));
 #endif
 	status = sc->scb->ie_status;
 	if (status & IE_ST_WHENCE) {
 		/* It still wants service... */
 		if (--loopcnt > 0)
 			goto loop;
 @@ -532,31 +532,31 @@ ie_intr(void *arg)
 void
 ierint(struct ie_softc *sc)
+{
 	volatile struct ie_sys_ctl_block *scb = sc->scb;
 	int i, status;
 	static int timesthru = 1024;
 	i = sc->rfhead;
 	for (;;) {
 		status = sc->rframes[i]->ie_fd_status;
 		if ((status & IE_FD_COMPLETE) && (status & IE_FD_OK)) {
 			if (!--timesthru) {
-				sc->sc_if.if_ierrors +=
+				if_statadd(&sc->sc_if, if_ierrors,
 				    SWAP(scb->ie_err_crc) +
 				    SWAP(scb->ie_err_align) +
 				    SWAP(scb->ie_err_resource) +
-				    SWAP(scb->ie_err_overrun);
+				    SWAP(scb->ie_err_overrun));
 				scb->ie_err_crc = 0;
 				scb->ie_err_align = 0;
 				scb->ie_err_resource = 0;
 				scb->ie_err_overrun = 0;
 				timesthru = 1024;
+			}
 			ie_readframe(sc, i);
 		} else {
 			if ((status & IE_FD_RNR) != 0 &&
 			    (scb->ie_status & IE_RU_READY) == 0) {
 				sc->rframes[0]->ie_fd_buf_desc = vtop16sw(sc,
 				    __UNVOLATILE(sc->rbuffs[0]));
 				scb->ie_recv_list = vtop16sw(sc,
 @@ -581,49 +581,49 @@ ietint(struct ie_softc *sc)
 	int status;
 	ifp = &sc->sc_if;
 	ifp->if_timer = 0;
 	ifp->if_flags &= ~IFF_OACTIVE;
 	status = sc->xmit_cmds[sc->xctail]->ie_xmit_status;
 	if (!(status & IE_STAT_COMPL) || (status & IE_STAT_BUSY))
 		printf("%s: command still busy!\n", __func__);
 	if (status & IE_STAT_OK) {
-		ifp->if_opackets++;
+		if_statadd2(ifp, if_opackets, 1,
-		ifp->if_collisions += SWAP(status & IE_XS_MAXCOLL);
+			    if_collisions, SWAP(status & IE_XS_MAXCOLL));
 	} else {
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		/*
 		 * XXX
 		 * Check SQE and DEFERRED?
 		 * What if more than one bit is set?
 		 */
 		if (status & IE_STAT_ABORT)
 			printf("%s: send aborted\n", device_xname(sc->sc_dev));
 		if (status & IE_XS_LATECOLL)
 			printf("%s: late collision\n",
 			    device_xname(sc->sc_dev));
 		if (status & IE_XS_NOCARRIER)
 			printf("%s: no carrier\n", device_xname(sc->sc_dev));
 		if (status & IE_XS_LOSTCTS)
 			printf("%s: lost CTS\n", device_xname(sc->sc_dev));
 		if (status & IE_XS_UNDERRUN)
 			printf("%s: DMA underrun\n", device_xname(sc->sc_dev));
 		if (status & IE_XS_EXCMAX) {
 			/* Do not print this one (too noisy). */
-			ifp->if_collisions += 16;
+			if_statadd(ifp, if_collisions, 16);
+		}
+	}
 	/*
 	 * If multicast addresses were added or deleted while we
 	 * were transmitting, mc_reset() set the want_mcsetup flag
 	 * indicating that we should do it.
 	 */
 	if (sc->want_mcsetup) {
 		mc_setup(sc, (void *)sc->xmit_cbuffs[sc->xctail]);
 		sc->want_mcsetup = 0;
+	}
 @@ -886,27 +886,27 @@ ie_readframe(struct ie_softc *sc, int nu
 	/* Advance the RFD list, since we're done with this descriptor. */
 	sc->rframes[num]->ie_fd_status = SWAP(0);
 	sc->rframes[num]->ie_fd_last |= IE_FD_LAST;
 	sc->rframes[sc->rftail]->ie_fd_last &= ~IE_FD_LAST;
 	sc->rftail = (sc->rftail + 1) % sc->nframes;
 	sc->rfhead = (sc->rfhead + 1) % sc->nframes;
 	if (status & IE_FD_OK) {
 		m = ieget(sc);
 		ie_drop_packet_buffer(sc);
+	}
 	if (m == 0) {
-		sc->sc_if.if_ierrors++;
+		if_statinc(&sc->sc_if, if_ierrors);
 		return;
+	}
 #ifdef IEDEBUG
 	if (sc->sc_debug & IED_READFRAME) {
 		struct ether_header *eh = mtod(m, struct ether_header *);
 		printf("%s: frame from ether %s type 0x%x\n",
 		    device_xname(sc->sc_dev),
 		    ether_sprintf(eh->ether_shost), (u_int)eh->ether_type);
+	}
 #endif