 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_enet.c,v 1.30 2020/01/15 01:09:56 jmcneill Exp $	*/
+/*	$NetBSD: if_enet.c,v 1.31 2020/01/29 06:05:31 thorpej Exp $	*/
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo@nerv.org>
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * (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.
  */
 /*
  * i.MX6,7 10/100/1000-Mbps ethernet MAC (ENET)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.30 2020/01/15 01:09:56 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.31 2020/01/29 06:05:31 thorpej Exp $");
 #include "vlan.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/mbuf.h>
 #include <sys/device.h>
 #include <sys/sockio.h>
 #include <sys/kernel.h>
 #include <sys/rndsource.h>
 #include <lib/libkern/libkern.h>
 @@ -371,29 +371,30 @@ enet_tick(void *arg)
 	mii = &sc->sc_mii;
 	ifp = &sc->sc_ethercom.ec_if;
 	s = splnet();
 	if (sc->sc_stopping)
 		goto out;
 #ifdef ENET_EVENT_COUNTER
 	enet_update_evcnt(sc);
 #endif
 	/* update counters */
-	ifp->if_ierrors += ENET_REG_READ(sc, ENET_RMON_R_UNDERSIZE);
+	if_statadd(ifp, if_ierrors,
-	ifp->if_ierrors += ENET_REG_READ(sc, ENET_RMON_R_FRAG);
+	    (uint64_t)ENET_REG_READ(sc, ENET_RMON_R_UNDERSIZE) +
-	ifp->if_ierrors += ENET_REG_READ(sc, ENET_RMON_R_JAB);
+	    (uint64_t)ENET_REG_READ(sc, ENET_RMON_R_FRAG) +
 	    (uint64_t)ENET_REG_READ(sc, ENET_RMON_R_JAB));
 	/* clear counters */
 	ENET_REG_WRITE(sc, ENET_MIBC, ENET_MIBC_MIB_CLEAR);
 	ENET_REG_WRITE(sc, ENET_MIBC, 0);
 	mii_tick(mii);
  out:
 	if (!sc->sc_stopping)
 		callout_schedule(&sc->sc_tick_ch, ENET_TICK);
 	splx(s);
+}
 @@ -451,54 +452,54 @@ enet_tx_intr(void *arg)
 		txs = &sc->sc_txsoft[idx];
 		TXDESC_READIN(idx);
 		if (sc->sc_txdesc_ring[idx].tx_flags1_len & TXFLAGS1_R) {
 			/* This TX Descriptor has not been transmitted yet */
 			break;
+		}
 		/* txsoft is available on first segment (TXFLAGS1_T1) */
 		if (sc->sc_txdesc_ring[idx].tx_flags1_len & TXFLAGS1_T1) {
 			bus_dmamap_unload(sc->sc_dmat,
 			    txs->txs_dmamap);
 			m_freem(txs->txs_mbuf);
-			ifp->if_opackets++;
+			if_statinc(ifp, if_opackets);
+		}
 		/* checking error */
 		if (sc->sc_txdesc_ring[idx].tx_flags1_len & TXFLAGS1_L) {
 			uint32_t flags2;
 			flags2 = sc->sc_txdesc_ring[idx].tx_flags2;
 			if (flags2 & (TXFLAGS2_TXE |
 			    TXFLAGS2_UE | TXFLAGS2_EE | TXFLAGS2_FE |
 			    TXFLAGS2_LCE | TXFLAGS2_OE | TXFLAGS2_TSE)) {
 #ifdef DEBUG_ENET
 				if (enet_debug) {
 					char flagsbuf[128];
 					snprintb(flagsbuf, sizeof(flagsbuf),
 					    "\20" "\20TRANSMIT" "\16UNDERFLOW"
 					    "\15COLLISION" "\14FRAME"
 					    "\13LATECOLLISION" "\12OVERFLOW",
 					    flags2);
 					device_printf(sc->sc_dev,
 					    "txdesc[%d]: transmit error: "
 					    "flags2=%s\n", idx, flagsbuf);
+				}
 #endif /* DEBUG_ENET */
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
+			}
+		}
 		sc->sc_tx_free++;
+	}
 	sc->sc_tx_considx = idx;
 	if (sc->sc_tx_free > 0)
 		ifp->if_flags &= ~IFF_OACTIVE;
 	/*
 	 * No more pending TX descriptor,
 	 * cancel the watchdog timer.
 @@ -579,27 +580,27 @@ enet_rx_intr(void *arg)
 					    "\20" "\31MISS" "\26LENGTHVIOLATION"
 					    "\25NONOCTET" "\23CRC" "\22OVERRUN"
 					    "\21TRUNCATED", flags1);
 					snprintb(flags2buf, sizeof(flags2buf),
 					    "\20" "\40MAC" "\33PHY"
 					    "\32COLLISION", flags2);
 					DEVICE_DPRINTF(
 					    "rxdesc[%d]: receive error: "
 					    "flags1=%s,flags2=%s,len=%d\n",
 					    idx, flags1buf, flags2buf, amount);
+				}
 #endif /* DEBUG_ENET */
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				m_freem(m0);
 			} else {
 				/* packet receive ok */
 				m_set_rcvif(m0, ifp);
 				m0->m_pkthdr.len = amount;
 				bus_dmamap_sync(sc->sc_dmat, rxs->rxs_dmamap, 0,
 				    rxs->rxs_dmamap->dm_mapsize,
 				    BUS_DMASYNC_PREREAD);
 				if (ifp->if_csum_flags_rx & (M_CSUM_IPv4 |
 				    M_CSUM_TCPv4 | M_CSUM_UDPv4 |
 @@ -863,27 +864,27 @@ enet_start(struct ifnet *ifp)
 			ifp->if_flags |= IFF_OACTIVE;
 			DEVICE_DPRINTF("TX descriptor is full\n");
 			break;
+		}
 		IFQ_DEQUEUE(&ifp->if_snd, m);
 		if (enet_encap_txring(sc, &m) != 0) {
 			/* too many mbuf chains? */
 			ifp->if_flags |= IFF_OACTIVE;
 			DEVICE_DPRINTF(
 			    "TX descriptor is full. dropping packet\n");
 			m_freem(m);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			break;
+		}
 		/* Pass the packet to any BPF listeners */
 		bpf_mtap(ifp, m, BPF_D_OUT);
+	}
 	if (npkt) {
 		/* enable TX DMA */
 		ENET_REG_WRITE(sc, ENET_TDAR, ENET_TDAR_ACTIVE);
 		ifp->if_timer = 5;
+	}
 @@ -919,27 +920,27 @@ enet_stop(struct ifnet *ifp, int disable
 	splx(s);
+}
 static void
 enet_watchdog(struct ifnet *ifp)
+{
 	struct enet_softc *sc;
 	int s;
 	sc = ifp->if_softc;
 	s = splnet();
 	device_printf(sc->sc_dev, "watchdog timeout\n");
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	/* salvage packets left in descriptors */
 	enet_tx_intr(sc);
 	enet_rx_intr(sc);
 	/* reset */
 	enet_stop(ifp, 1);
 	enet_init(ifp);
 	splx(s);
+}
 static void
 @@ -1312,27 +1313,27 @@ enet_drain_txbuf(struct enet_softc *sc)
 	for (idx = sc->sc_tx_considx; idx != sc->sc_tx_prodidx;
 	    idx = ENET_TX_NEXTIDX(idx)) {
 		/* txsoft[] is used only first segment */
 		txs = &sc->sc_txsoft[idx];
 		TXDESC_READIN(idx);
 		if (sc->sc_txdesc_ring[idx].tx_flags1_len & TXFLAGS1_T1) {
 			sc->sc_txdesc_ring[idx].tx_flags1_len = 0;
 			bus_dmamap_unload(sc->sc_dmat,
 			    txs->txs_dmamap);
 			m_freem(txs->txs_mbuf);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
+		}
 		sc->sc_tx_free++;
+	}
+}
 static void
 enet_drain_rxbuf(struct enet_softc *sc)
+{
 	int i;
 	for (i = 0; i < ENET_RX_RING_CNT; i++) {
 		if (sc->sc_rxsoft[i].rxs_mbuf != NULL) {
 			sc->sc_rxdesc_ring[i].rx_flags1_len = 0;

 @@ -1,14 +1,14 @@
-/* $NetBSD: sun4i_emac.c,v 1.11 2019/05/28 07:41:46 msaitoh Exp $ */
+/* $NetBSD: sun4i_emac.c,v 1.12 2020/01/29 06:05:31 thorpej Exp $ */
 /*-
  * Copyright (c) 2013-2017 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry and Jared McNeill.
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sun4i_emac.c,v 1.11 2019/05/28 07:41:46 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun4i_emac.c,v 1.12 2020/01/29 06:05:31 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/ioctl.h>
 #include <sys/mutex.h>
 #include <sys/rndsource.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <net/bpf.h>
 #include <net/if.h>
 @@ -559,33 +559,33 @@ sun4i_emac_rx_intr(struct sun4i_emac_sof
+		}
 		uint32_t v = sun4i_emac_read(sc, EMAC_RX_IO_DATA_REG);
 		if (v != EMAC_RX_MAGIC) {
 			sun4i_emac_rxfifo_flush(sc);
 			return;
+		}
 		uint32_t rxhdr = sun4i_emac_read(sc, EMAC_RX_IO_DATA_REG);
 		uint32_t rxlen = __SHIFTOUT(rxhdr, EMAC_RXHDR_LEN);
 		uint32_t rxsts = __SHIFTOUT(rxhdr, EMAC_RXHDR_STS);
 		if (rxlen < ETHER_MIN_LEN || (rxsts & EMAC_RX_STA_PKTOK) == 0) {
-			sc->sc_ec.ec_if.if_ierrors++;
+			if_statinc(&sc->sc_ec.ec_if, if_ierrors);
 			continue;
+		}
 		m = sun4i_emac_mgethdr(sc, rxlen);
 		if (m == NULL) {
-			sc->sc_ec.ec_if.if_ierrors++;
+			if_statinc(&sc->sc_ec.ec_if, if_ierrors);
 			sun4i_emac_rxfifo_consume(sc, rxlen);
 			return;
+		}
 		sun4i_emac_rxfifo_transfer(sc, m);
 		sun4i_emac_if_input(sc, m);
+	}
+}
 static int
 sun4i_emac_txfifo_transfer(struct sun4i_emac_softc *sc, struct mbuf *m, u_int slot)
+{
 	bus_size_t const io_data_reg = EMAC_TX_IO_DATA_REG(0);
 @@ -821,27 +821,27 @@ sun4i_emac_ifinit(struct ifnet *ifp)
 	mii_mediachg(mii);
 	callout_schedule(&sc->sc_stat_ch, hz);
 	return 0;
+}
 static void
 sun4i_emac_ifwatchdog(struct ifnet *ifp)
+{
 	struct sun4i_emac_softc * const sc = ifp->if_softc;
 	device_printf(sc->sc_dev, "device timeout\n");
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	sun4i_emac_ifinit(ifp);
 	sun4i_emac_ifstart(ifp);
+}
 static void
 sun4i_emac_rx_hash(struct sun4i_emac_softc *sc)
+{
 	struct ethercom *ec = &sc->sc_ec;
 	struct ifnet * const ifp = &ec->ec_if;
 	struct ether_multistep step;
 	struct ether_multi *enm;
 	uint32_t hash[2];
 	uint32_t rxctl;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sunxi_can.c,v 1.2 2019/10/21 08:00:58 msaitoh Exp $	*/
+/*	$NetBSD: sunxi_can.c,v 1.3 2020/01/29 06:05:31 thorpej Exp $	*/
 /*-
  * Copyright (c) 2017,2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Manuel Bouyer.
+ *
  * 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.
 @@ -26,27 +26,27 @@
  * 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.
  */
 #include "locators.h"
 #include "opt_can.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sunxi_can.c,v 1.2 2019/10/21 08:00:58 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sunxi_can.c,v 1.3 2020/01/29 06:05:31 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/ioctl.h>
 #include <sys/mutex.h>
 #include <sys/rndsource.h>
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 #include <net/if.h>
 #include <net/if_types.h>
 @@ -243,34 +243,34 @@ sunxi_can_rx_intr(struct sunxi_can_softc
+{
 	uint32_t reg0v;
 	struct mbuf *m;
 	struct ifnet  *ifp = sc->sc_ifp;
 	struct can_frame *cf;
 	int dlc;
 	int regd, i;
 	KASSERT(mutex_owned(&sc->sc_intr_lock));
 	reg0v = sunxi_can_read(sc, SUNXI_CAN_TXBUF0_REG);
 	dlc = reg0v & SUNXI_CAN_TXBUF0_DL;
 	if (dlc > CAN_MAX_DLC) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		sunxi_can_write(sc, SUNXI_CAN_CMD_REG, SUNXI_CAN_CMD_REL_RX_BUF);
 		return;
+	}
 	m = m_gethdr(M_NOWAIT, MT_HEADER);
 	if (m == NULL) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		sunxi_can_write(sc, SUNXI_CAN_CMD_REG, SUNXI_CAN_CMD_REL_RX_BUF);
 		return;
+	}
 	cf = mtod(m, struct can_frame *);
 	memset(cf, 0, sizeof(struct can_frame));
 	cf->can_dlc = dlc;
 	if (reg0v & SUNXI_CAN_TXBUF0_EFF) {
 		cf->can_id =
 		    (sunxi_can_read(sc, SUNXI_CAN_TXBUF1_REG) << 21) |
 		    (sunxi_can_read(sc, SUNXI_CAN_TXBUF2_REG) << 13) |
 		    (sunxi_can_read(sc, SUNXI_CAN_TXBUF3_REG) << 5) |
 @@ -282,42 +282,41 @@ sunxi_can_rx_intr(struct sunxi_can_softc
 		    (sunxi_can_read(sc, SUNXI_CAN_TXBUF1_REG) << 3) |
 		    ((sunxi_can_read(sc, SUNXI_CAN_TXBUF2_REG) << 5) & 0x7);
 		regd = SUNXI_CAN_TXBUF3_REG;
+	}
 	if (reg0v & SUNXI_CAN_TXBUF0_RTR) {
 		cf->can_id |= CAN_RTR_FLAG;
 	} else {
 		for (i = 0; i < cf->can_dlc; i++) {
 			cf->data[i] = sunxi_can_read(sc, regd + i * 4);
+		}
+	}
 	sunxi_can_write(sc, SUNXI_CAN_CMD_REG, SUNXI_CAN_CMD_REL_RX_BUF);
 	m->m_len = m->m_pkthdr.len = CAN_MTU;
-	ifp->if_ibytes += m->m_len;
+	if_statadd(ifp, if_ibytes, m->m_len);
 	m_set_rcvif(m, ifp);
 	can_bpf_mtap(ifp, m, 1);
 	can_input(ifp, m);
+}
 static void
 sunxi_can_tx_intr(struct sunxi_can_softc *sc)
+{
 	struct ifnet * const ifp = sc->sc_ifp;
 	struct mbuf *m;
 	KASSERT(mutex_owned(&sc->sc_intr_lock));
 	if ((m = sc->sc_m_transmit) != NULL) {
-		ifp->if_obytes += m->m_len;
+		if_statadd2(ifp, if_obytes, m->m_len, if_opackets, 1);
 		ifp->if_opackets++;
 		can_mbuf_tag_clean(m);
 		m_set_rcvif(m, ifp);
 		can_input(ifp, m); /* loopback */
 		sc->sc_m_transmit = NULL;
 		ifp->if_timer = 0;
+	}
 	ifp->if_flags &= ~IFF_OACTIVE;
 	if_schedule_deferred_start(ifp);
+}
 static int
 sunxi_can_tx_abort(struct sunxi_can_softc *sc)
+{
 @@ -336,50 +335,50 @@ sunxi_can_tx_abort(struct sunxi_can_soft
+	}
 	return 0;
+}
 static void
 sunxi_can_err_intr(struct sunxi_can_softc *sc, uint32_t irq, uint32_t sts)
+{
 	struct ifnet * const ifp = sc->sc_ifp;
 	KASSERT(mutex_owned(&sc->sc_intr_lock));
 	int txerr = 0;
 	uint32_t reg;
 	if (irq & SUNXI_CAN_INT_DATA_OR) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		sunxi_can_write(sc, SUNXI_CAN_CMD_REG, SUNXI_CAN_CMD_CLR_OR);
+	}
 	if (irq & SUNXI_CAN_INT_ERR) {
 		reg = sunxi_can_read(sc, SUNXI_CAN_REC_REG);
 		printf("%s: ERR interrupt status 0x%x counters 0x%x\n",
 		    device_xname(sc->sc_dev), sts, reg);
+	}
 	if (irq & SUNXI_CAN_INT_BERR) {
 		if (sts & SUNXI_CAN_STA_TX)
 			txerr++;
 		if (sts & SUNXI_CAN_STA_RX)
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
+	}
 	if (irq & SUNXI_CAN_INT_ERR_PASSIVE) {
 		printf("%s: PASSV interrupt status 0x%x\n",
 		    device_xname(sc->sc_dev), sts);
+	}
 	if (irq & SUNXI_CAN_INT_ARB_LOST) {
 		txerr++;
+	}
 	if (txerr) {
-		ifp->if_oerrors += txerr;
+		if_statadd(ifp, if_oerrors, txerr);
 		(void) sunxi_can_tx_abort(sc);
+	}
+}
 int
 sunxi_can_intr(void *arg)
+{
 	struct sunxi_can_softc * const sc = arg;
 	int rv = 0;
 	int irq;
 	mutex_enter(&sc->sc_intr_lock);
 @@ -593,27 +592,27 @@ sunxi_can_ifwatchdog(struct ifnet *ifp)
 	struct sunxi_can_softc * const sc = ifp->if_softc;
 	printf("%s: watchdog timeout\n", device_xname(sc->sc_dev));
 	mutex_enter(&sc->sc_intr_lock);
 	printf("irq 0x%x en 0x%x mode 0x%x status 0x%x timings 0x%x err 0x%x\n",
 	    sunxi_can_read(sc, SUNXI_CAN_INT_REG),
 	    sunxi_can_read(sc, SUNXI_CAN_INTE_REG),
 	    sunxi_can_read(sc, SUNXI_CAN_MODSEL_REG),
 	    sunxi_can_read(sc, SUNXI_CAN_STA_REG),
 	    sunxi_can_read(sc, SUNXI_CAN_BUS_TIME_REG),
 	    sunxi_can_read(sc, SUNXI_CAN_REC_REG));
 	/* if there is a transmit in progress abort */
 	if (sunxi_can_tx_abort(sc)) {
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
+	}
 	mutex_exit(&sc->sc_intr_lock);
+}
 static void
 sunxi_can_enter_reset(struct sunxi_can_softc *sc)
+{
 	int i;
 	uint32_t val;
 	for (i = 0; i < 1000; i++) {
 		val = sunxi_can_read(sc, SUNXI_CAN_MODSEL_REG);
 		val |= SUNXI_CAN_MODSEL_RST;

 @@ -1,14 +1,14 @@
-/* $NetBSD: sunxi_emac.c,v 1.28 2019/07/13 21:56:23 thorpej Exp $ */
+/* $NetBSD: sunxi_emac.c,v 1.29 2020/01/29 06:05:31 thorpej Exp $ */
 /*-
  * Copyright (c) 2016-2017 Jared McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -23,27 +23,27 @@
  * 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.
  */
 /*
  * Allwinner Gigabit Ethernet MAC (EMAC) controller
  */
 #include "opt_net_mpsafe.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.28 2019/07/13 21:56:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.29 2020/01/29 06:05:31 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mutex.h>
 #include <sys/callout.h>
 #include <sys/gpio.h>
 #include <sys/cprng.h>
 #include <net/if.h>
 @@ -818,27 +818,27 @@ sunxi_emac_rxintr(struct sunxi_emac_soft
+			}
 			++npkt;
 			if_percpuq_enqueue(ifp->if_percpuq, m);
+		}
 		if ((m0 = sunxi_emac_alloc_mbufcl(sc)) != NULL) {
 			error = sunxi_emac_setup_rxbuf(sc, index, m0);
 			if (error != 0) {
 				/* XXX hole in RX ring */
+			}
 		} else
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 		sunxi_emac_dma_sync(sc, sc->rx.desc_tag, sc->rx.desc_map,
 		    index, index + 1,
 		    RX_DESC_COUNT, BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+	}
 	sc->rx.cur = index;
 	return npkt;
+}
 static void
 sunxi_emac_txintr(struct sunxi_emac_softc *sc)
 @@ -866,27 +866,27 @@ sunxi_emac_txintr(struct sunxi_emac_soft
 , bmap->map->dm_mapsize,
 			    BUS_DMASYNC_POSTWRITE);
 			bus_dmamap_unload(sc->tx.buf_tag, bmap->map);
 			m_freem(bmap->mbuf);
 			bmap->mbuf = NULL;
+		}
 		sunxi_emac_setup_txdesc(sc, i, 0, 0, 0);
 		sunxi_emac_dma_sync(sc, sc->tx.desc_tag, sc->tx.desc_map,
 		    i, i + 1, TX_DESC_COUNT,
 		    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
 		ifp->if_flags &= ~IFF_OACTIVE;
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
+	}
 	sc->tx.next = i;
+}
 static int
 sunxi_emac_intr(void *arg)
+{
 	struct sunxi_emac_softc *sc = arg;
 	struct ifnet *ifp = &sc->ec.ec_if;
 	uint32_t val;
 	EMAC_LOCK(sc);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_cpsw.c,v 1.10 2020/01/06 06:50:00 msaitoh Exp $	*/
+/*	$NetBSD: if_cpsw.c,v 1.11 2020/01/29 06:05:31 thorpej Exp $	*/
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -43,27 +43,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.10 2020/01/06 06:50:00 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.11 2020/01/29 06:05:31 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/intr.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 @@ -619,27 +619,27 @@ cpsw_start(struct ifnet *ifp)
 	while (txfree > 0) {
 		IFQ_POLL(&ifp->if_snd, m);
 		if (m == NULL)
 			break;
 		dm = rdp->tx_dm[sc->sc_txnext];
 		error = bus_dmamap_load_mbuf(sc->sc_bdt, dm, m, BUS_DMA_NOWAIT);
 		if (error == EFBIG) {
 			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");
 			break;
+		}
 		if (dm->dm_nsegs + 1 >= txfree) {
 			ifp->if_flags |= IFF_OACTIVE;
 			bus_dmamap_unload(sc->sc_bdt, dm);
 			break;
+		}
 		mlen = m_length(m);
 @@ -729,27 +729,27 @@ cpsw_ioctl(struct ifnet *ifp, u_long cmd
 	splx(s);
 	return error;
+}
 static void
 cpsw_watchdog(struct ifnet *ifp)
+{
 	struct cpsw_softc *sc = ifp->if_softc;
 	device_printf(sc->sc_dev, "device timeout\n");
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	cpsw_init(ifp);
 	cpsw_start(ifp);
+}
 static int
 cpsw_mii_wait(struct cpsw_softc * const sc, int reg)
+{
 	u_int tries;
 	for (tries = 0; tries < 1000; tries++) {
 		if ((cpsw_read_4(sc, reg) & __BIT(31)) == 0)
 			return 0;
 		delay(1);
 @@ -1159,27 +1159,27 @@ cpsw_rxintr(void *arg)
 			return 1;
+		}
 		if ((dw[3] & (CPDMA_BD_SOP | CPDMA_BD_EOP)) !=
 		    (CPDMA_BD_SOP | CPDMA_BD_EOP)) {
 			//Debugger();
+		}
 		bus_dmamap_sync(sc->sc_bdt, dm, 0, dm->dm_mapsize,
 		    BUS_DMASYNC_POSTREAD);
 		if (cpsw_new_rxbuf(sc, i) != 0) {
 			/* drop current packet, reuse buffer for new */
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			goto next;
+		}
 		off = __SHIFTOUT(dw[2], (uint32_t)__BITS(26, 16));
 		len = __SHIFTOUT(dw[3], (uint32_t)__BITS(10,  0));
 		if (ISSET(dw[3], CPDMA_BD_PASSCRC))
 			len -= ETHER_CRC_LEN;
 		m_set_rcvif(m, ifp);
 		m->m_pkthdr.len = m->m_len = len;
 		m->m_data += off;
 @@ -1263,27 +1263,27 @@ cpsw_txintr(void *arg)
 		if (ISSET(dw[3], CPDMA_BD_TDOWNCMPLT)) {
 			sc->sc_txrun = false;
 			return 1;
+		}
 		bus_dmamap_sync(sc->sc_bdt, rdp->tx_dm[sc->sc_txhead],
 , rdp->tx_dm[sc->sc_txhead]->dm_mapsize,
 		    BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->sc_bdt, rdp->tx_dm[sc->sc_txhead]);
 		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;
 		ifp->if_flags &= ~IFF_OACTIVE;
 next:
 		if (ISSET(dw[3], CPDMA_BD_EOP) && ISSET(dw[3], CPDMA_BD_EOQ)) {
 			sc->sc_txeoq = true;
+		}
 		if (sc->sc_txhead == cpi) {
 			cpsw_write_4(sc, CPSW_CPDMA_TX_CP(0),
 			    cpsw_txdesc_paddr(sc, cpi));
 			sc->sc_txhead = TXDESC_NEXT(sc->sc_txhead);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ixp425_if_npe.c,v 1.44 2019/12/27 08:22:49 msaitoh Exp $ */
+/*	$NetBSD: ixp425_if_npe.c,v 1.45 2020/01/29 06:05:31 thorpej Exp $ */
 /*-
  * Copyright (c) 2006 Sam Leffler.  All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -18,27 +18,27 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR 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.
  */
 #include <sys/cdefs.h>
 #if 0
 __FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.44 2019/12/27 08:22:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.45 2020/01/29 06:05:31 thorpej Exp $");
 /*
  * Intel XScale NPE Ethernet driver.
+ *
  * This driver handles the two ports present on the IXP425.
  * Packet processing is done by the Network Processing Engines
  * (NPE's) that work together with a MAC and PHY. The MAC
  * is also mapped to the XScale cpu; the PHY is accessed via
  * the MAC. NPE-XScale communication happens through h/w
  * queues managed by the Q Manager block.
+ *
  * The code here replaces the ethAcc, ethMii, and ethDB classes
  * in the Intel Access Library (IAL) and the OS-specific driver.
 @@ -693,40 +693,43 @@ npe_ifmedia_status(struct ifnet *ifp, st
 	mii_pollstat(&sc->sc_mii);
 	ifmr->ifm_active = sc->sc_mii.mii_media_active;
 	ifmr->ifm_status = sc->sc_mii.mii_media_status;
+}
 static void
 npe_addstats(struct npe_softc *sc)
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	struct npestats *ns = sc->sc_stats;
-	ifp->if_oerrors +=
+	net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 	if_statadd_ref(nsr, if_oerrors,
 		  be32toh(ns->dot3StatsInternalMacTransmitErrors)
 		+ be32toh(ns->dot3StatsCarrierSenseErrors)
 		+ be32toh(ns->TxVLANIdFilterDiscards)
 		);
-	ifp->if_ierrors += be32toh(ns->dot3StatsFCSErrors)
+	if_statadd_ref(nsr, if_ierrors,
 		  be32toh(ns->dot3StatsFCSErrors)
 		+ be32toh(ns->dot3StatsInternalMacReceiveErrors)
 		+ be32toh(ns->RxOverrunDiscards)
 		+ be32toh(ns->RxUnderflowEntryDiscards)
 		);
-	ifp->if_collisions +=
+	if_statadd_ref(nsr, if_collisions,
 		  be32toh(ns->dot3StatsSingleCollisionFrames)
 		+ be32toh(ns->dot3StatsMultipleCollisionFrames)
 		);
 	IF_STAT_PUTREF(ifp);
+}
 static void
 npe_tick(void *xsc)
+{
 #define	ACK	(NPE_RESETSTATS << NPE_MAC_MSGID_SHL)
 	struct npe_softc *sc = xsc;
 	uint32_t msg[2];
 	/*
 	 * NB: to avoid sleeping with the softc lock held we
 	 * split the NPE msg processing into two parts.  The
 	 * request for statistics is sent w/o waiting for a
 @@ -788,27 +791,27 @@ struct txdone {
 };
 static __inline void
 npe_txdone_finish(struct npe_softc *sc, const struct txdone *td)
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	*td->tail = sc->tx_free;
 	sc->tx_free = td->head;
 	/*
 	 * We're no longer busy, so clear the busy flag and call the
 	 * start routine to xmit more packets.
 	 */
-	ifp->if_opackets += td->count;
+	if_statadd(ifp, if_opackets, td->count);
 	ifp->if_flags &= ~IFF_OACTIVE;
 	ifp->if_timer = 0;
 	if_schedule_deferred_start(ifp);
+}
 /*
  * Q manager callback on tx done queue.  Reap mbufs
  * and return tx buffers to the free list.  Finally
  * restart output.  Note the microcode has only one
  * txdone q wired into it so we must use the NPE ID
  * returned with each npehwbuf to decide where to
  * send buffers.
  */
 @@ -943,27 +946,27 @@ npe_rxdone(int qid, void *arg)
 			/* set m_len etc. per rx frame size */
 			mrx->m_len = be32toh(hw->ix_ne[0].len) & 0xffff;
 			mrx->m_pkthdr.len = mrx->m_len;
 			m_set_rcvif(mrx, ifp);
 			/* Don't add M_HASFCS. See below */
 #if 1
 			if (mrx->m_pkthdr.len < sizeof(struct ether_header)) {
 				log(LOG_INFO, "%s: too short frame (len=%d)\n",
 				    device_xname(sc->sc_dev),
 				    mrx->m_pkthdr.len);
 				/* Back out "newly allocated" mbuf. */
 				m_freem(m);
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				goto fail;
+			}
 			if ((ifp->if_flags & IFF_PROMISC) == 0) {
 				struct ether_header *eh;
 				/*
 				 * Workaround for "Non-Intel XScale Technology
 				 * Eratta" No. 29. AA:BB:CC:DD:EE:xF's packet
 				 * matches the filter (both unicast and
 				 * multicast).
 				 */
 				eh = mtod(mrx, struct ether_header *);
 				if (ETHER_IS_MULTICAST(eh->ether_dhost) == 0) {
 @@ -1022,27 +1025,27 @@ npe_rxdone(int qid, void *arg)
 						 * Back out "newly allocated"
 						 * mbuf.
 						 */
 						m_freem(m);
 						goto fail;
+					}
+				}
+			}
 			if (mrx->m_pkthdr.len > NPE_FRAME_SIZE_DEFAULT) {
 				log(LOG_INFO, "%s: oversized frame (len=%d)\n",
 				    device_xname(sc->sc_dev), mrx->m_pkthdr.len);
 				/* Back out "newly allocated" mbuf. */
 				m_freem(m);
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				goto fail;
+			}
 #endif
 			/*
 			 * Trim FCS!
 			 * NPE always adds the FCS by this driver's setting,
 			 * so we always trim it here and not add M_HASFCS.
 			 */
 			m_adj(mrx, -ETHER_CRC_LEN);
 			/*
 			 * Tap off here if there is a bpf listener.
 @@ -1144,27 +1147,27 @@ npeinit_macreg(struct npe_softc *sc)
 	WR4(sc, NPE_MAC_RX_CNTRL1,
 		  NPE_RX_CNTRL1_CRC_EN		/* include CRC/FCS */
 		| NPE_RX_CNTRL1_PAUSE_EN);	/* ena pause frame handling */
 	WR4(sc, NPE_MAC_RX_CNTRL2, 0);
+}
 static void
 npeinit_resetcb(void *xsc)
+{
 	struct npe_softc *sc = xsc;
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	uint32_t msg[2];
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	npeinit_locked(sc);
 	msg[0] = NPE_NOTIFYMACRECOVERYDONE << NPE_MAC_MSGID_SHL
 	    | (npeconfig[sc->sc_unit].macport << NPE_MAC_PORTID_SHL);
 	msg[1] = 0;
 	ixpnpe_sendandrecvmsg(sc->sc_npe, msg, msg);
+}
 /*
  * Reset and initialize the chip
  */
 static void
 npeinit_locked(void *xsc)
 @@ -1392,27 +1395,27 @@ npestop(struct ifnet *ifp, int disable)
 	ifp->if_timer = 0;
 	ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+}
 void
 npewatchdog(struct ifnet *ifp)
+{
 	struct npe_softc *sc = ifp->if_softc;
 	int s;
 	aprint_error_dev(sc->sc_dev, "device timeout\n");
 	s = splnet();
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	npeinit_locked(sc);
 	splx(s);
+}
 static int
 npeioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct npe_softc *sc = ifp->if_softc;
 	struct ifreq *ifr = (struct ifreq *) data;
 	int s, error = 0;
 	s = splnet();