 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_cas.c,v 1.37 2019/12/26 17:51:08 msaitoh Exp $	*/
+/*	$NetBSD: if_cas.c,v 1.38 2020/01/30 05:24:53 thorpej Exp $	*/
 /*	$OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $	*/
 /*
+ *
  * Copyright (C) 2007 Mark Kettenis.
  * Copyright (C) 2001 Eduardo Horvath.
  * 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
 @@ -34,27 +34,27 @@
 /*
  * Driver for Sun Cassini ethernet controllers.
+ *
  * There are basically two variants of this chip: Cassini and
  * Cassini+.  We can distinguish between the two by revision: 0x10 and
  * up are Cassini+.  The most important difference is that Cassini+
  * has a second RX descriptor ring.  Cassini+ will not work without
  * configuring that second ring.  However, since we don't use it we
  * don't actually fill the descriptors, and only hand off the first
  * four to the chip.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.37 2019/12/26 17:51:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.38 2020/01/30 05:24:53 thorpej Exp $");
 #ifndef _MODULE
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 @@ -832,40 +832,44 @@ cas_partial_detach(struct cas_softc *sc,
 	(*ca->ca_detach)(sc->sc_dev, 0);
+}
 void
 cas_tick(void *arg)
+{
 	struct cas_softc *sc = arg;
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	bus_space_tag_t t = sc->sc_memt;
 	bus_space_handle_t mac = sc->sc_memh;
 	int s;
 	uint32_t v;
 	net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 	/* unload collisions counters */
 	v = bus_space_read_4(t, mac, CAS_MAC_EXCESS_COLL_CNT) +
 	    bus_space_read_4(t, mac, CAS_MAC_LATE_COLL_CNT);
-	ifp->if_collisions += v +
+	if_statadd_ref(nsr, if_collisions, v +
 	    bus_space_read_4(t, mac, CAS_MAC_NORM_COLL_CNT) +
-	    bus_space_read_4(t, mac, CAS_MAC_FIRST_COLL_CNT);
+	    bus_space_read_4(t, mac, CAS_MAC_FIRST_COLL_CNT));
-	ifp->if_oerrors += v;
+	if_statadd_ref(nsr, if_oerrors, v);
 	/* read error counters */
-	ifp->if_ierrors +=
+	if_statadd_ref(nsr, if_ierrors,
 	    bus_space_read_4(t, mac, CAS_MAC_RX_LEN_ERR_CNT) +
 	    bus_space_read_4(t, mac, CAS_MAC_RX_ALIGN_ERR) +
 	    bus_space_read_4(t, mac, CAS_MAC_RX_CRC_ERR_CNT) +
-	    bus_space_read_4(t, mac, CAS_MAC_RX_CODE_VIOL);
+	    bus_space_read_4(t, mac, CAS_MAC_RX_CODE_VIOL));
 	IF_STAT_PUTREF(ifp);
 	/* clear the hardware counters */
 	bus_space_write_4(t, mac, CAS_MAC_NORM_COLL_CNT, 0);
 	bus_space_write_4(t, mac, CAS_MAC_FIRST_COLL_CNT, 0);
 	bus_space_write_4(t, mac, CAS_MAC_EXCESS_COLL_CNT, 0);
 	bus_space_write_4(t, mac, CAS_MAC_LATE_COLL_CNT, 0);
 	bus_space_write_4(t, mac, CAS_MAC_RX_LEN_ERR_CNT, 0);
 	bus_space_write_4(t, mac, CAS_MAC_RX_ALIGN_ERR, 0);
 	bus_space_write_4(t, mac, CAS_MAC_RX_CRC_ERR_CNT, 0);
 	bus_space_write_4(t, mac, CAS_MAC_RX_CODE_VIOL, 0);
 	s = splnet();
 	mii_tick(&sc->sc_mii);
 @@ -1406,27 +1410,27 @@ cas_rint(struct cas_softc *sc)
 			if (word[0] & CAS_RC0_RELEASE_HDR)
 				cas_add_rxbuf(sc, idx);
 			if (m != NULL) {
 				/*
 				 * Pass this up to any BPF listeners, but only
 				 * pass it up the stack if its for us.
 				 */
 				m->m_pkthdr.csum_flags = 0;
 				if_percpuq_enqueue(ifp->if_percpuq, m);
 			} else
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
+		}
 		len = CAS_RC0_DATA_LEN(word[0]);
 		if (len > 0) {
 			off = CAS_RC0_DATA_OFF(word[0]);
 			idx = CAS_RC0_DATA_IDX(word[0]);
 			rxs = &sc->sc_rxsoft[idx];
 			DPRINTF(sc, ("data at idx %d, off %d, len %d\n",
 			    idx, off, len));
 			bus_dmamap_sync(sc->sc_dmatag, rxs->rxs_dmamap, 0,
 			    rxs->rxs_dmamap->dm_mapsize, BUS_DMASYNC_POSTREAD);
 @@ -1436,27 +1440,27 @@ cas_rint(struct cas_softc *sc)
 			m = m_devget(cp, len, 0, ifp);
 			if (word[0] & CAS_RC0_RELEASE_DATA)
 				cas_add_rxbuf(sc, idx);
 			if (m != NULL) {
 				/*
 				 * Pass this up to any BPF listeners, but only
 				 * pass it up the stack if its for us.
 				 */
 				m->m_pkthdr.csum_flags = 0;
 				if_percpuq_enqueue(ifp->if_percpuq, m);
 			} else
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
+		}
 		if (word[0] & CAS_RC0_SPLIT)
 			aprint_error_dev(sc->sc_dev, "split packet\n");
 		skip = CAS_RC0_SKIP(word[0]);
+	}
 	while (sc->sc_rxptr != i) {
 		sc->sc_rxcomps[sc->sc_rxptr].cc_word[0] = 0;
 		sc->sc_rxcomps[sc->sc_rxptr].cc_word[1] = 0;
 		sc->sc_rxcomps[sc->sc_rxptr].cc_word[2] = 0;
 		sc->sc_rxcomps[sc->sc_rxptr].cc_word[3] =
 @@ -1576,53 +1580,53 @@ cas_intr(void *v)
+	}
 	if (status & CAS_INTR_RX_MAC) {
 		int rxstat = bus_space_read_4(t, seb, CAS_MAC_RX_STATUS);
 #ifdef CAS_DEBUG
 		if (rxstat & ~CAS_MAC_RX_DONE)
 			printf("%s: MAC rx fault, status %x\n",
 			    device_xname(sc->sc_dev), rxstat);
 #endif
 		/*
 		 * On some chip revisions CAS_MAC_RX_OVERFLOW happen often
 		 * due to a silicon bug so handle them silently.
 		 */
 		if (rxstat & CAS_MAC_RX_OVERFLOW) {
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			cas_init(ifp);
+		}
 #ifdef CAS_DEBUG
 		else if (rxstat & ~(CAS_MAC_RX_DONE | CAS_MAC_RX_FRAME_CNT))
 			printf("%s: MAC rx fault, status %x\n",
 			    device_xname(sc->sc_dev), rxstat);
 #endif
+	}
 	rnd_add_uint32(&sc->rnd_source, status);
 	return (r);
+}
 void
 cas_watchdog(struct ifnet *ifp)
+{
 	struct cas_softc *sc = ifp->if_softc;
 	DPRINTF(sc, ("cas_watchdog: CAS_RX_CONFIG %x CAS_MAC_RX_STATUS %x "
 		"CAS_MAC_RX_CONFIG %x\n",
 		bus_space_read_4(sc->sc_memt, sc->sc_memh, CAS_RX_CONFIG),
 		bus_space_read_4(sc->sc_memt, sc->sc_memh, CAS_MAC_RX_STATUS),
 		bus_space_read_4(sc->sc_memt, sc->sc_memh, CAS_MAC_RX_CONFIG)));
 	log(LOG_ERR, "%s: device timeout\n", device_xname(sc->sc_dev));
-	++ifp->if_oerrors;
+	if_statinc(ifp, if_oerrors);
 	/* Try to get more packets going. */
 	cas_init(ifp);
+}
 /*
  * Initialize the MII Management Interface
  */
 void
 cas_mifinit(struct cas_softc *sc)
+{
 	bus_space_tag_t t = sc->sc_memt;
 	bus_space_handle_t mif = sc->sc_memh;
 @@ -2121,27 +2125,27 @@ cas_tint(struct cas_softc *sc, uint32_t
 	struct cas_sxd *sd;
 	uint32_t cons, comp;
 	comp = bus_space_read_4(sc->sc_memt, sc->sc_memh, CAS_TX_COMPLETION);
 	cons = sc->sc_tx_cons;
 	while (cons != comp) {
 		sd = &sc->sc_txd[cons];
 		if (sd->sd_mbuf != NULL) {
 			bus_dmamap_sync(sc->sc_dmatag, sd->sd_map, 0,
 			    sd->sd_map->dm_mapsize, BUS_DMASYNC_POSTWRITE);
 			bus_dmamap_unload(sc->sc_dmatag, sd->sd_map);
 			m_freem(sd->sd_mbuf);
 			sd->sd_mbuf = NULL;
-			ifp->if_opackets++;
+			if_statinc(ifp, if_opackets);
+		}
 		sc->sc_tx_cnt--;
 		if (++cons == CAS_NTXDESC)
 			cons = 0;
+	}
 	sc->sc_tx_cons = cons;
 	if (sc->sc_tx_cnt < CAS_NTXDESC - 2)
 		ifp->if_flags &= ~IFF_OACTIVE;
 	if (sc->sc_tx_cnt == 0)
 		ifp->if_timer = 0;
 	if_schedule_deferred_start(ifp);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_dge.c,v 1.56 2019/11/10 21:16:36 chs Exp $ */
+/*	$NetBSD: if_dge.c,v 1.57 2020/01/30 05:24:53 thorpej Exp $ */
 /*
  * Copyright (c) 2004, SUNET, Swedish University Computer Network.
  * All rights reserved.
+ *
  * Written by Anders Magnusson for SUNET, Swedish University Computer Network.
+ *
  * 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
 @@ -70,27 +70,27 @@
  */
 /*
  * Device driver for the Intel 82597EX Ten Gigabit Ethernet controller.
+ *
  * TODO (in no specific order):
  *	HW VLAN support.
  *	TSE offloading (needs kernel changes...)
  *	RAIDC (receive interrupt delay adaptation)
  *	Use memory > 4GB.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.56 2019/11/10 21:16:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.57 2020/01/30 05:24:53 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 @@ -1415,27 +1415,27 @@ dge_watchdog(struct ifnet *ifp)
+{
 	struct dge_softc *sc = ifp->if_softc;
 	/*
 	 * Since we're using delayed interrupts, sweep up
 	 * before we report an error.
 	 */
 	dge_txintr(sc);
 	if (sc->sc_txfree != DGE_NTXDESC) {
 		printf("%s: device timeout (txfree %d txsfree %d txnext %d)\n",
 		    device_xname(sc->sc_dev), sc->sc_txfree, sc->sc_txsfree,
 		    sc->sc_txnext);
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		/* Reset the interface. */
 		(void) dge_init(ifp);
+	}
 	/* Try to get more packets going. */
 	dge_start(ifp);
+}
 /*
  * dge_ioctl:		[ifnet interface function]
+ *
  *	Handle control requests from the operator.
 @@ -1612,27 +1612,27 @@ dge_txintr(struct dge_softc *sc)
 		status =
 		    sc->sc_txdescs[txs->txs_lastdesc].dt_status;
 		if ((status & TDESC_STA_DD) == 0) {
 			DGE_CDTXSYNC(sc, txs->txs_lastdesc, 1,
 			    BUS_DMASYNC_PREREAD);
 			break;
+		}
 		DPRINTF(DGE_DEBUG_TX,
 		    ("%s: TX: job %d done: descs %d..%d\n",
 		    device_xname(sc->sc_dev), i, txs->txs_firstdesc,
 		    txs->txs_lastdesc));
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
 		sc->sc_txfree += txs->txs_ndesc;
 		bus_dmamap_sync(sc->sc_dmat, txs->txs_dmamap,
 , txs->txs_dmamap->dm_mapsize, BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->sc_dmat, txs->txs_dmamap);
 		m_freem(txs->txs_mbuf);
 		txs->txs_mbuf = NULL;
+	}
 	/* Update the dirty transmit buffer pointer. */
 	sc->sc_txsdirty = i;
 	DPRINTF(DGE_DEBUG_TX,
 	    ("%s: TX: txsdirty -> %d\n", device_xname(sc->sc_dev), i));
 @@ -1696,27 +1696,27 @@ dge_rxintr(struct dge_softc *sc)
 		bus_dmamap_sync(sc->sc_dmat, rxs->rxs_dmamap, 0,
 		    rxs->rxs_dmamap->dm_mapsize, BUS_DMASYNC_POSTREAD);
 		m = rxs->rxs_mbuf;
 		/*
 		 * Add a new receive buffer to the ring.
 		 */
 		if (dge_add_rxbuf(sc, i) != 0) {
 			/*
 			 * Failed, throw away what we've done so
 			 * far, and discard the rest of the packet.
 			 */
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			bus_dmamap_sync(sc->sc_dmat, rxs->rxs_dmamap, 0,
 			    rxs->rxs_dmamap->dm_mapsize, BUS_DMASYNC_PREREAD);
 			DGE_INIT_RXDESC(sc, i);
 			if ((status & RDESC_STS_EOP) == 0)
 				sc->sc_rxdiscard = 1;
 			if (sc->sc_rxhead != NULL)
 				m_freem(sc->sc_rxhead);
 			DGE_RXCHAIN_RESET(sc);
 			DPRINTF(DGE_DEBUG_RX,
 			    ("%s: RX: Rx buffer allocation failed, "
 			    "dropping packet%s\n", device_xname(sc->sc_dev),
 			    sc->sc_rxdiscard ? " (discard)" : ""));
 			continue;
 @@ -1751,27 +1751,27 @@ dge_rxintr(struct dge_softc *sc)
 		len += sc->sc_rxlen;
 		DGE_RXCHAIN_RESET(sc);
 		DPRINTF(DGE_DEBUG_RX,
 		    ("%s: RX: have entire packet, len -> %d\n",
 		    device_xname(sc->sc_dev), len));
 		/*
 		 * If an error occurred, update stats and drop the packet.
 		 */
 		if (errors & (RDESC_ERR_CE | RDESC_ERR_SE | RDESC_ERR_P |
 		    RDESC_ERR_RXE)) {
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			if (errors & RDESC_ERR_SE)
 				printf("%s: symbol error\n",
 				    device_xname(sc->sc_dev));
 			else if (errors & RDESC_ERR_P)
 				printf("%s: parity error\n",
 				    device_xname(sc->sc_dev));
 			else if (errors & RDESC_ERR_CE)
 				printf("%s: CRC error\n",
 				    device_xname(sc->sc_dev));
 			m_freem(m);
 			continue;
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ste.c,v 1.58 2019/11/02 21:11:55 tnn Exp $	*/
+/*	$NetBSD: if_ste.c,v 1.59 2020/01/30 05:24:53 thorpej Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * 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.
  */
 /*
  * Device driver for the Sundance Tech. ST-201 10/100
  * Ethernet controller.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.58 2019/11/02 21:11:55 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.59 2020/01/30 05:24:53 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 @@ -770,27 +770,27 @@ ste_start(struct ifnet *ifp)
+}
 /*
  * ste_watchdog:	[ifnet interface function]
+ *
  *	Watchdog timer handler.
  */
 static void
 ste_watchdog(struct ifnet *ifp)
+{
 	struct ste_softc *sc = ifp->if_softc;
 	printf("%s: device timeout\n", device_xname(sc->sc_dev));
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	ste_txintr(sc);
 	ste_rxintr(sc);
 	(void) ste_init(ifp);
 	/* Try to get more packets going. */
 	ste_start(ifp);
+}
 /*
  * ste_ioctl:		[ifnet interface function]
+ *
  *	Handle control requests from the operator.
 @@ -1029,27 +1029,27 @@ ste_rxintr(struct ste_softc *sc)
 			if (m == NULL)
 				goto dropit;
 			m->m_data += 2;
 			memcpy(mtod(m, void *),
 			    mtod(ds->ds_mbuf, void *), len);
 			STE_INIT_RXDESC(sc, i);
 			bus_dmamap_sync(sc->sc_dmat, ds->ds_dmamap, 0,
 			    ds->ds_dmamap->dm_mapsize,
 			    BUS_DMASYNC_PREREAD);
 		} else {
 			m = ds->ds_mbuf;
 			if (ste_add_rxbuf(sc, i) != 0) {
  dropit:
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				STE_INIT_RXDESC(sc, i);
 				bus_dmamap_sync(sc->sc_dmat,
 				    ds->ds_dmamap, 0,
 				    ds->ds_dmamap->dm_mapsize,
 				    BUS_DMASYNC_PREREAD);
 				continue;
+			}
+		}
 		m_set_rcvif(m, ifp);
 		m->m_pkthdr.len = m->m_len = len;
 		/* Pass it on. */
 @@ -1087,45 +1087,49 @@ ste_tick(void *arg)
 static void
 ste_stats_update(struct ste_softc *sc)
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	bus_space_tag_t st = sc->sc_st;
 	bus_space_handle_t sh = sc->sc_sh;
 	(void) bus_space_read_2(st, sh, STE_OctetsReceivedOk0);
 	(void) bus_space_read_2(st, sh, STE_OctetsReceivedOk1);
 	(void) bus_space_read_2(st, sh, STE_OctetsTransmittedOk0);
 	(void) bus_space_read_2(st, sh, STE_OctetsTransmittedOk1);
-	ifp->if_opackets +=
+	net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 	    (u_int) bus_space_read_2(st, sh, STE_FramesTransmittedOK);
 	if_statadd_ref(nsr, if_opackets,
 	    (u_int) bus_space_read_2(st, sh, STE_FramesTransmittedOK));
 	(void) bus_space_read_2(st, sh, STE_FramesReceivedOK);
-	ifp->if_collisions +=
+	if_statadd_ref(nsr, if_collisions,
 	    (u_int) bus_space_read_1(st, sh, STE_LateCollisions) +
 	    (u_int) bus_space_read_1(st, sh, STE_MultipleColFrames) +
-	    (u_int) bus_space_read_1(st, sh, STE_SingleColFrames);
+	    (u_int) bus_space_read_1(st, sh, STE_SingleColFrames));
 	(void) bus_space_read_1(st, sh, STE_FramesWDeferredXmt);
-	ifp->if_ierrors +=
+	if_statadd_ref(nsr, if_ierrors,
-	    (u_int) bus_space_read_1(st, sh, STE_FramesLostRxErrors);
+	    (u_int) bus_space_read_1(st, sh, STE_FramesLostRxErrors));
-	ifp->if_oerrors +=
+	if_statadd_ref(nsr, if_oerrors,
 	    (u_int) bus_space_read_1(st, sh, STE_FramesWExDeferral) +
 	    (u_int) bus_space_read_1(st, sh, STE_FramesXbortXSColls) +
-	    bus_space_read_1(st, sh, STE_CarrierSenseErrors);
+	    bus_space_read_1(st, sh, STE_CarrierSenseErrors));
 	IF_STAT_PUTREF(ifp);
 	(void) bus_space_read_1(st, sh, STE_BcstFramesXmtdOk);
 	(void) bus_space_read_1(st, sh, STE_BcstFramesRcvdOk);
 	(void) bus_space_read_1(st, sh, STE_McstFramesXmtdOk);
 	(void) bus_space_read_1(st, sh, STE_McstFramesRcvdOk);
+}
 /*
  * ste_reset:
+ *
  *	Perform a soft reset on the ST-201.
  */
 static void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_stge.c,v 1.77 2020/01/14 09:49:26 msaitoh Exp $	*/
+/*	$NetBSD: if_stge.c,v 1.78 2020/01/30 05:24:53 thorpej Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * 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.
  */
 /*
  * Device driver for the Sundance Tech. TC9021 10/100/1000
  * Ethernet controller.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.77 2020/01/14 09:49:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.78 2020/01/30 05:24:53 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 @@ -1018,27 +1018,27 @@ stge_start(struct ifnet *ifp)
  *	Watchdog timer handler.
  */
 static void
 stge_watchdog(struct ifnet *ifp)
+{
 	struct stge_softc *sc = ifp->if_softc;
 	/*
 	 * Sweep up first, since we don't interrupt every frame.
 	 */
 	stge_txintr(sc);
 	if (sc->sc_txpending != 0) {
 		printf("%s: device timeout\n", device_xname(sc->sc_dev));
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		(void) stge_init(ifp);
 		/* Try to get more packets going. */
 		stge_start(ifp);
+	}
+}
 /*
  * stge_ioctl:		[ifnet interface function]
+ *
  *	Handle control requests from the operator.
  */
 @@ -1251,27 +1251,27 @@ stge_rxintr(struct stge_softc *sc)
 		bus_dmamap_sync(sc->sc_dmat, ds->ds_dmamap, 0,
 		    ds->ds_dmamap->dm_mapsize, BUS_DMASYNC_POSTREAD);
 		m = ds->ds_mbuf;
 		/*
 		 * Add a new receive buffer to the ring.
 		 */
 		if (stge_add_rxbuf(sc, i) != 0) {
 			/*
 			 * Failed, throw away what we've done so
 			 * far, and discard the rest of the packet.
 			 */
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			bus_dmamap_sync(sc->sc_dmat, ds->ds_dmamap, 0,
 			    ds->ds_dmamap->dm_mapsize, BUS_DMASYNC_POSTREAD);
 			STGE_INIT_RXDESC(sc, i);
 			if ((status & RFD_FrameEnd) == 0)
 				sc->sc_rxdiscard = 1;
 			if (sc->sc_rxhead != NULL)
 				m_freem(sc->sc_rxhead);
 			STGE_RXCHAIN_RESET(sc);
 			continue;
+		}
 #ifdef DIAGNOSTIC
 		if (status & RFD_FrameStart) {
 @@ -1321,27 +1321,27 @@ stge_rxintr(struct stge_softc *sc)
 		tailm->m_len = len - sc->sc_rxlen;
 		/*
 		 * If the packet is small enough to fit in a
 		 * single header mbuf, allocate one and copy
 		 * the data into it.  This greatly reduces
 		 * memory consumption when we receive lots
 		 * of small packets.
 		 */
 		if (stge_copy_small != 0 && len <= (MHLEN - 2)) {
 			struct mbuf *nm;
 			MGETHDR(nm, M_DONTWAIT, MT_DATA);
 			if (nm == NULL) {
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				m_freem(m);
 				continue;
+			}
 			nm->m_data += 2;
 			nm->m_pkthdr.len = nm->m_len = len;
 			m_copydata(m, 0, len, mtod(nm, void *));
 			m_freem(m);
 			m = nm;
+		}
 		/*
 		 * Set the incoming checksum information for the packet.
 		 */
 @@ -1423,42 +1423,46 @@ stge_tick(void *arg)
  * stge_stats_update:
+ *
  *	Read the TC9021 statistics counters.
  */
 static void
 stge_stats_update(struct stge_softc *sc)
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	(void) CSR_READ_4(sc, STGE_OctetRcvOk);
 	(void) CSR_READ_4(sc, STGE_FramesRcvdOk);
-	ifp->if_ierrors +=
+	net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 	    (u_int) CSR_READ_2(sc, STGE_FramesLostRxErrors);
 	if_statadd_ref(nsr, if_ierrors,
 	    (u_int) CSR_READ_2(sc, STGE_FramesLostRxErrors));
 	(void) CSR_READ_4(sc, STGE_OctetXmtdOk);
-	ifp->if_opackets +=
+	if_statadd_ref(nsr, if_opackets,
-	    CSR_READ_4(sc, STGE_FramesXmtdOk);
+	    CSR_READ_4(sc, STGE_FramesXmtdOk));
-	ifp->if_collisions +=
+	if_statadd_ref(nsr, if_collisions,
 	    CSR_READ_4(sc, STGE_LateCollisions) +
 	    CSR_READ_4(sc, STGE_MultiColFrames) +
-	    CSR_READ_4(sc, STGE_SingleColFrames);
+	    CSR_READ_4(sc, STGE_SingleColFrames));
-	ifp->if_oerrors +=
+	if_statadd_ref(nsr, if_oerrors,
 	    (u_int) CSR_READ_2(sc, STGE_FramesAbortXSColls) +
-	    (u_int) CSR_READ_2(sc, STGE_FramesWEXDeferal);
+	    (u_int) CSR_READ_2(sc, STGE_FramesWEXDeferal));
 	IF_STAT_PUTREF(ifp);
+}
 /*
  * stge_reset:
+ *
  *	Perform a soft reset on the TC9021.
  */
 static void
 stge_reset(struct stge_softc *sc)
+{
 	uint32_t ac;
 	int i;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_tl.c,v 1.118 2019/12/22 23:23:32 thorpej Exp $	*/
+/*	$NetBSD: if_tl.c,v 1.119 2020/01/30 05:24:53 thorpej Exp $	*/
 /*
  * Copyright (c) 1997 Manuel Bouyer.  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 @@
  * 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.
  */
 /*
  * Texas Instruments ThunderLAN ethernet controller
  * ThunderLAN Programmer's Guide (TI Literature Number SPWU013A)
  * available from www.ti.com
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.118 2019/12/22 23:23:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.119 2020/01/30 05:24:53 thorpej Exp $");
 #undef TLDEBUG
 #define TL_PRIV_STATS
 #undef TLDEBUG_RX
 #undef TLDEBUG_TX
 #undef TLDEBUG_ADDR
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 @@ -1399,27 +1399,27 @@ bad:
 #endif
 	Tx->next = sc->Free_Tx;
 	sc->Free_Tx = Tx;
+}
 static void
 tl_ifwatchdog(struct ifnet *ifp)
+{
 	tl_softc_t *sc = ifp->if_softc;
 	if ((ifp->if_flags & IFF_RUNNING) == 0)
 		return;
 	printf("%s: device timeout\n", device_xname(sc->sc_dev));
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	tl_init(ifp);
+}
 static int
 tl_mediachange(struct ifnet *ifp)
+{
 	if (ifp->if_flags & IFF_UP)
 		tl_init(ifp);
 	return 0;
+}
 static int
 @@ -1494,52 +1494,54 @@ tl_read_stats(tl_softc_t *sc)
 	uint32_t reg;
 	int ierr_overr;
 	int ierr_code;
 	int ierr_crc;
 	int oerr_underr;
 	int oerr_deferred;
 	int oerr_coll;
 	int oerr_multicoll;
 	int oerr_exesscoll;
 	int oerr_latecoll;
 	int oerr_carrloss;
 	struct ifnet *ifp = &sc->tl_if;
 	net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 	reg =  tl_intreg_read(sc, TL_INT_STATS_TX);
-	ifp->if_opackets += reg & 0x00ffffff;
+	if_statadd_ref(nsr, if_opackets, reg & 0x00ffffff);
 	oerr_underr = reg >> 24;
 	reg =  tl_intreg_read(sc, TL_INT_STATS_RX);
 	ierr_overr = reg >> 24;
 	reg =  tl_intreg_read(sc, TL_INT_STATS_FERR);
 	ierr_crc = (reg & TL_FERR_CRC) >> 16;
 	ierr_code = (reg & TL_FERR_CODE) >> 24;
 	oerr_deferred = (reg & TL_FERR_DEF);
 	reg =  tl_intreg_read(sc, TL_INT_STATS_COLL);
 	oerr_multicoll = (reg & TL_COL_MULTI);
 	oerr_coll = (reg & TL_COL_SINGLE) >> 16;
 	reg =  tl_intreg_read(sc, TL_INT_LERR);
 	oerr_exesscoll = (reg & TL_LERR_ECOLL);
 	oerr_latecoll = (reg & TL_LERR_LCOLL) >> 8;
 	oerr_carrloss = (reg & TL_LERR_CL) >> 16;
 	if_statadd_ref(nsr, if_oerrors,
-	ifp->if_oerrors += oerr_underr + oerr_exesscoll + oerr_latecoll +
+	   oerr_underr + oerr_exesscoll + oerr_latecoll + oerr_carrloss);
-	   oerr_carrloss;
+	if_statadd_ref(nsr, if_collisions, oerr_coll + oerr_multicoll);
-	ifp->if_collisions += oerr_coll + oerr_multicoll;
+	if_statadd_ref(nsr, if_ierrors, ierr_overr + ierr_code + ierr_crc);
-	ifp->if_ierrors += ierr_overr + ierr_code + ierr_crc;
+	IF_STAT_PUTREF(ifp);
 	if (ierr_overr)
 		printf("%s: receiver ring buffer overrun\n",
 		    device_xname(sc->sc_dev));
 	if (oerr_underr)
 		printf("%s: transmit buffer underrun\n",
 		    device_xname(sc->sc_dev));
 #ifdef TL_PRIV_STATS
 	sc->ierr_overr		+= ierr_overr;
 	sc->ierr_code		+= ierr_code;
 	sc->ierr_crc		+= ierr_crc;
 	sc->oerr_underr		+= oerr_underr;
 	sc->oerr_deferred	+= oerr_deferred;

 @@ -1,14 +1,14 @@
-/* $NetBSD: if_vge.c,v 1.78 2019/12/27 07:41:23 msaitoh Exp $ */
+/* $NetBSD: if_vge.c,v 1.79 2020/01/30 05:24:53 thorpej Exp $ */
 /*-
  * Copyright (c) 2004
  *	Bill Paul <wpaul@windriver.com>.  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.
 @@ -25,27 +25,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
  * 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.
+ *
  * FreeBSD: src/sys/dev/vge/if_vge.c,v 1.5 2005/02/07 19:39:29 glebius Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.78 2019/12/27 07:41:23 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.79 2020/01/30 05:24:53 thorpej Exp $");
 /*
  * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
+ *
  * Written by Bill Paul <wpaul@windriver.com>
  * Senior Networking Software Engineer
  * Wind River Systems
  */
 /*
  * The VIA Networking VT6122 is a 32bit, 33/66 MHz PCI device that
  * combines a tri-speed ethernet MAC and PHY, with the following
  * features:
 @@ -1221,46 +1221,46 @@ vge_rxeof(struct vge_softc *sc)
 		/*
 		 * Bad/error frames will have the RXOK bit cleared.
 		 * However, there's one error case we want to allow:
 		 * if a VLAN tagged frame arrives and the chip can't
 		 * match it against the CAM filter, it considers this
 		 * a 'VLAN CAM filter miss' and clears the 'RXOK' bit.
 		 * We don't want to drop the frame though: our VLAN
 		 * filtering is done in software.
 		 */
 		if ((rxstat & VGE_RDSTS_RXOK) == 0 &&
 		    (rxstat & VGE_RDSTS_VIDM) == 0 &&
 		    (rxstat & VGE_RDSTS_CSUMERR) == 0) {
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			/*
 			 * If this is part of a multi-fragment packet,
 			 * discard all the pieces.
 			 */
 			if (sc->sc_rx_mhead != NULL) {
 				m_freem(sc->sc_rx_mhead);
 				sc->sc_rx_mhead = sc->sc_rx_mtail = NULL;
+			}
 			vge_newbuf(sc, idx, m);
 			continue;
+		}
 		/*
 		 * If allocating a replacement mbuf fails,
 		 * reload the current one.
 		 */
 		if (vge_newbuf(sc, idx, NULL)) {
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			if (sc->sc_rx_mhead != NULL) {
 				m_freem(sc->sc_rx_mhead);
 				sc->sc_rx_mhead = sc->sc_rx_mtail = NULL;
+			}
 			vge_newbuf(sc, idx, m);
 			continue;
+		}
 		if (sc->sc_rx_mhead != NULL) {
 			m->m_len = total_len % VGE_RX_BUFSIZE;
 			/*
 			 * Special case: if there's 4 bytes or less
 			 * in this buffer, the mbuf can be discarded:
 @@ -1353,32 +1353,34 @@ vge_txeof(struct vge_softc *sc)
 		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 		txstat = le32toh(sc->sc_txdescs[idx].td_sts);
 		VGE_TXDESCSYNC(sc, idx, BUS_DMASYNC_PREREAD);
 		if (txstat & VGE_TDSTS_OWN) {
 			break;
+		}
 		txs = &sc->sc_txsoft[idx];
 		m_freem(txs->txs_mbuf);
 		txs->txs_mbuf = NULL;
 		bus_dmamap_sync(sc->sc_dmat, txs->txs_dmamap, 0,
 		    txs->txs_dmamap->dm_mapsize, BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->sc_dmat, txs->txs_dmamap);
 		net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 		if (txstat & (VGE_TDSTS_EXCESSCOLL | VGE_TDSTS_COLL))
-			ifp->if_collisions++;
+			if_statinc_ref(nsr, if_collisions);
 		if (txstat & VGE_TDSTS_TXERR)
-			ifp->if_oerrors++;
+			if_statinc_ref(nsr, if_oerrors);
 		else
-			ifp->if_opackets++;
+			if_statinc_ref(nsr, if_opackets);
 		IF_STAT_PUTREF(ifp);
+	}
 	sc->sc_tx_considx = idx;
 	if (sc->sc_tx_free > 0) {
 		ifp->if_flags &= ~IFF_OACTIVE;
+	}
 	/*
 	 * If not all descriptors have been released reaped yet,
 	 * reload the timer so that we will eventually get another
 	 * interrupt that will cause us to re-enter this routine.
 	 * This is done in case the transmitter has gone idle.
 @@ -2009,27 +2011,27 @@ vge_ioctl(struct ifnet *ifp, u_long comm
 	splx(s);
 	return error;
+}
 static void
 vge_watchdog(struct ifnet *ifp)
+{
 	struct vge_softc *sc;
 	int s;
 	sc = ifp->if_softc;
 	s = splnet();
 	printf("%s: watchdog timeout\n", device_xname(sc->sc_dev));
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	vge_txeof(sc);
 	vge_rxeof(sc);
 	vge_init(ifp);
 	splx(s);
+}
 /*
  * Stop the adapter and free any mbufs allocated to the
  * RX and TX lists.
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_vr.c,v 1.131 2019/09/13 07:55:07 msaitoh Exp $	*/
+/*	$NetBSD: if_vr.c,v 1.132 2020/01/30 05:24:53 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * 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
 @@ -87,27 +87,27 @@
  * The Rhine has a serious flaw in its transmit DMA mechanism:
  * transmit buffers must be longword aligned. Unfortunately,
  * the kernel doesn't guarantee that mbufs will be filled in starting
  * at longword boundaries, so we have to do a buffer copy before
  * transmission.
+ *
  * Apparently, the receive DMA mechanism also has the same flaw.  This
  * means that on systems with struct alignment requirements, incoming
  * frames must be copied to a new buffer which shifts the data forward
  * 2 bytes so that the payload is aligned on a 4-byte boundary.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.131 2019/09/13 07:55:07 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.132 2020/01/30 05:24:53 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 @@ -615,27 +615,27 @@ vr_rxeof(struct vr_softc *sc)
 			 */
 			break;
+		}
 		/*
 		 * If an error occurs, update stats, clear the
 		 * status word and leave the mbuf cluster in place:
 		 * it should simply get re-used next time this descriptor
 		 * comes up in the ring.
 		 */
 		if (rxstat & VR_RXSTAT_RXERR) {
 			const char *errstr;
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			switch (rxstat & 0x000000FF) {
 			case VR_RXSTAT_CRCERR:
 				errstr = "crc error";
 				break;
 			case VR_RXSTAT_FRAMEALIGNERR:
 				errstr = "frame alignment error";
 				break;
 			case VR_RXSTAT_FIFOOFLOW:
 				errstr = "FIFO overflow";
 				break;
 			case VR_RXSTAT_GIANT:
 				errstr = "received giant packet";
 				break;
 @@ -655,51 +655,51 @@ vr_rxeof(struct vr_softc *sc)
 			aprint_error_dev(sc->vr_dev, "receive error: %s\n",
 			    errstr);
 			VR_INIT_RXDESC(sc, i);
 			continue;
 		} else if (!(rxstat & VR_RXSTAT_FIRSTFRAG) ||
 			   !(rxstat & VR_RXSTAT_LASTFRAG)) {
 			/*
 			 * This driver expects to receive whole packets every
 			 * time.  In case we receive a fragment that is not
 			 * a complete packet, we discard it.
 			 */
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			aprint_error_dev(sc->vr_dev,
 			    "receive error: incomplete frame; "
 			    "size = %d, status = 0x%x\n",
 			    VR_RXBYTES(le32toh(d->vr_status)), rxstat);
 			VR_INIT_RXDESC(sc, i);
 			continue;
+		}
 		bus_dmamap_sync(sc->vr_dmat, ds->ds_dmamap, 0,
 		    ds->ds_dmamap->dm_mapsize, BUS_DMASYNC_POSTREAD);
 		/* No errors; receive the packet. */
 		total_len = VR_RXBYTES(le32toh(d->vr_status));
 #ifdef DIAGNOSTIC
 		if (total_len == 0) {
 			/*
 			 * If we receive a zero-length packet, we probably
 			 * missed to handle an error condition above.
 			 * Discard it to avoid a later crash.
 			 */
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			aprint_error_dev(sc->vr_dev,
 			    "receive error: zero-length packet; "
 			    "status = 0x%x\n", rxstat);
 			VR_INIT_RXDESC(sc, i);
 			continue;
+		}
 #endif
 		/*
 		 * The Rhine chip includes the CRC with every packet.
 @@ -723,46 +723,46 @@ vr_rxeof(struct vr_softc *sc)
 			MGETHDR(m, M_DONTWAIT, MT_DATA);
 			if (m == NULL)
 				goto dropit;
 			memcpy(mtod(m, void *),
 			    mtod(ds->ds_mbuf, void *), total_len);
 			VR_INIT_RXDESC(sc, i);
 			bus_dmamap_sync(sc->vr_dmat, ds->ds_dmamap, 0,
 			    ds->ds_dmamap->dm_mapsize,
 			    BUS_DMASYNC_PREREAD);
 		} else {
 			m = ds->ds_mbuf;
 			if (vr_add_rxbuf(sc, i) == ENOBUFS) {
  dropit:
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				VR_INIT_RXDESC(sc, i);
 				bus_dmamap_sync(sc->vr_dmat,
 				    ds->ds_dmamap, 0,
 				    ds->ds_dmamap->dm_mapsize,
 				    BUS_DMASYNC_PREREAD);
 				continue;
+			}
+		}
 #else
 		/*
 		 * The Rhine's packet buffers must be 4-byte aligned.
 		 * But this means that the data after the Ethernet header
 		 * is misaligned.  We must allocate a new buffer and
 		 * copy the data, shifted forward 2 bytes.
 		 */
 		MGETHDR(m, M_DONTWAIT, MT_DATA);
 		if (m == NULL) {
  dropit:
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			VR_INIT_RXDESC(sc, i);
 			bus_dmamap_sync(sc->vr_dmat, ds->ds_dmamap, 0,
 			    ds->ds_dmamap->dm_mapsize, BUS_DMASYNC_PREREAD);
 			continue;
+		}
 		if (total_len > (MHLEN - 2)) {
 			MCLGET(m, M_DONTWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_freem(m);
 				goto dropit;
+			}
+		}
 		m->m_data += 2;
 @@ -788,27 +788,27 @@ vr_rxeof(struct vr_softc *sc)
 	/* Update the receive pointer. */
 	sc->vr_rxptr = i;
+}
 void
 vr_rxeoc(struct vr_softc *sc)
+{
 	struct ifnet *ifp;
 	int i;
 	ifp = &sc->vr_ec.ec_if;
-	ifp->if_ierrors++;
+	if_statinc(ifp, if_ierrors);
 	VR_CLRBIT16(sc, VR_COMMAND, VR_CMD_RX_ON);
 	for (i = 0; i < VR_TIMEOUT; i++) {
 		DELAY(10);
 		if ((CSR_READ_2(sc, VR_COMMAND) & VR_CMD_RX_ON) == 0)
 			break;
+	}
 	if (i == VR_TIMEOUT) {
 		/* XXX need reset? */
 		aprint_error_dev(sc->vr_dev, "RX shutdown never completed\n");
+	}
 	vr_rxeof(sc);
 @@ -864,36 +864,39 @@ vr_txeof(struct vr_softc *sc)
 			CSR_WRITE_4(sc, VR_TXADDR, VR_CDTXADDR(sc, i));
 			break;
+		}
 		if (txstat & VR_TXSTAT_OWN)
 			break;
 		bus_dmamap_sync(sc->vr_dmat, ds->ds_dmamap,
 , ds->ds_dmamap->dm_mapsize, BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->vr_dmat, ds->ds_dmamap);
 		m_freem(ds->ds_mbuf);
 		ds->ds_mbuf = NULL;
 		net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 		if (txstat & VR_TXSTAT_ERRSUM) {
-			ifp->if_oerrors++;
+			if_statinc_ref(nsr, if_oerrors);
 			if (txstat & VR_TXSTAT_DEFER)
-				ifp->if_collisions++;
+				if_statinc_ref(nsr, if_collisions);
 			if (txstat & VR_TXSTAT_LATECOLL)
-				ifp->if_collisions++;
+				if_statinc_ref(nsr, if_collisions);
+		}
-		ifp->if_collisions += (txstat & VR_TXSTAT_COLLCNT) >> 3;
+		if_statadd_ref(nsr, if_collisions,
-		ifp->if_opackets++;
+		    (txstat & VR_TXSTAT_COLLCNT) >> 3);
 		if_statinc_ref(nsr, if_opackets);
 		IF_STAT_PUTREF(ifp);
+	}
 	/* Update the dirty transmit buffer pointer. */
 	sc->vr_txdirty = i;
 	/*
 	 * Cancel the watchdog timer if there are no pending
 	 * transmissions.
 	 */
 	if (sc->vr_txpending == 0)
 		ifp->if_timer = 0;
+}
 @@ -924,27 +927,27 @@ vr_intr(void *arg)
 		if ((status & VR_INTRS) == 0)
 			break;
 		handled = 1;
 		rnd_add_uint32(&sc->rnd_source, status);
 		if (status & VR_ISR_RX_OK)
 			vr_rxeof(sc);
 		if (status & VR_ISR_RX_DROPPED) {
 			aprint_error_dev(sc->vr_dev, "rx packet lost\n");
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
+		}
 		if (status &
 		    (VR_ISR_RX_ERR | VR_ISR_RX_NOBUF | VR_ISR_RX_OFLOW))
 			vr_rxeoc(sc);
 		if (status & (VR_ISR_BUSERR | VR_ISR_TX_UNDERRUN)) {
 			if (status & VR_ISR_BUSERR)
 				aprint_error_dev(sc->vr_dev, "PCI bus error\n");
 			if (status & VR_ISR_TX_UNDERRUN)
 				aprint_error_dev(sc->vr_dev,
 				    "transmit underrun\n");
 @@ -957,27 +960,27 @@ vr_intr(void *arg)
 		if (status & VR_ISR_TX_OK) {
 			dotx = 1;
 			vr_txeof(sc);
+		}
 		if (status &
 		    (VR_ISR_TX_ABRT | VR_ISR_TX_ABRT2 | VR_ISR_TX_UDFI)) {
 			if (status & (VR_ISR_TX_ABRT | VR_ISR_TX_ABRT2))
 				aprint_error_dev(sc->vr_dev,
 				    "transmit aborted\n");
 			if (status & VR_ISR_TX_UDFI)
 				aprint_error_dev(sc->vr_dev,
 				    "transmit underflow\n");
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			dotx = 1;
 			vr_txeof(sc);
 			if (sc->vr_txpending) {
 				VR_SETBIT16(sc, VR_COMMAND, VR_CMD_TX_ON);
 				VR_SETBIT16(sc, VR_COMMAND, VR_CMD_TX_GO);
+			}
+		}
+	}
 	/* Re-enable interrupts. */
 	CSR_WRITE_2(sc, VR_IMR, VR_INTRS);
 	if (dotx)
 @@ -1320,27 +1323,27 @@ vr_ioctl(struct ifnet *ifp, u_long comma
 			vr_setmulti(sc);
+	}
 	splx(s);
 	return error;
+}
 static void
 vr_watchdog(struct ifnet *ifp)
+{
 	struct vr_softc *sc = ifp->if_softc;
 	aprint_error_dev(sc->vr_dev, "device timeout\n");
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	(void) vr_init(ifp);
+}
 /*
  * One second timer, used to tick MII.
  */
 static void
 vr_tick(void *arg)
+{
 	struct vr_softc *sc = arg;
 	int s;