 @@ -1,14 +1,14 @@
-/* $NetBSD: if_admsw.c,v 1.27 2019/12/05 06:25:33 msaitoh Exp $ */
+/* $NetBSD: if_admsw.c,v 1.28 2020/01/29 05:30:14 thorpej Exp $ */
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
  * 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
 @@ -66,27 +66,27 @@
  */
 /*
  * Device driver for Alchemy Semiconductor Au1x00 Ethernet Media
  * Access Controller.
+ *
  * TODO:
+ *
  *	Better Rx buffer management; we want to get new Rx buffers
  *	to the chip more quickly than we currently do.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.27 2019/12/05 06:25:33 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.28 2020/01/29 05:30:14 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/intr.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 @@ -861,27 +861,27 @@ admsw_txintr(struct admsw_softc *sc, int
 		bus_dmamap_sync(sc->sc_dmat, ds->ds_dmamap,
 , ds->ds_dmamap->dm_mapsize, BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->sc_dmat, ds->ds_dmamap);
 		m_freem(ds->ds_mbuf);
 		ds->ds_mbuf = NULL;
 		vlan = ffs(desc->status & 0x3f) - 1;
 		if (vlan < 0 || vlan >= SW_DEVS)
 			panic("admsw_txintr: bad vlan\n");
 		ifp = &sc->sc_ethercom[vlan].ec_if;
 		gotone = 1;
 		/* printf("clear tx slot %d\n", i); */
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
 		sc->sc_txfree++;
+	}
 	if (gotone) {
 		sc->sc_txdirty = i;
 #ifdef ADMSW_EVENT_COUNTERS
 		ADMSW_EVCNT_INCR(&sc->sc_ev_txintr);
 #endif
 		for (vlan = 0; vlan < SW_DEVS; vlan++)
 			sc->sc_ethercom[vlan].ec_if.if_flags &= ~IFF_OACTIVE;
 		ifp = &sc->sc_ethercom[0].ec_if;
 @@ -985,27 +985,27 @@ admsw_rxintr(struct admsw_softc *sc, int
 		stat = sc->sc_rxldescs[i].status;
 		len = (stat & ADM5120_DMA_LEN) >> ADM5120_DMA_LENSHIFT;
 		len -= ETHER_CRC_LEN;
 		port = (stat & ADM5120_DMA_PORTID) >> ADM5120_DMA_PORTSHIFT;
 		for (vlan = 0; vlan < SW_DEVS; vlan++)
 			if ((1 << port) & vlan_matrix[vlan])
 				break;
 		if (vlan == SW_DEVS)
 			vlan = 0;
 		ifp = &sc->sc_ethercom[vlan].ec_if;
 		m = ds->ds_mbuf;
 		if (admsw_add_rxlbuf(sc, i) != 0) {
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			ADMSW_INIT_RXLDESC(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;
 		if ((stat & ADM5120_DMA_TYPE) == ADM5120_DMA_TYPE_IP) {
 			m->m_pkthdr.csum_flags |= M_CSUM_IPv4;
 			if (stat & ADM5120_DMA_CSUMFAIL)
 				m->m_pkthdr.csum_flags |= M_CSUM_IPv4_BAD;
+		}

 @@ -1,14 +1,14 @@
-/* $NetBSD: if_aumac.c,v 1.47 2019/05/28 07:41:47 msaitoh Exp $ */
+/* $NetBSD: if_aumac.c,v 1.48 2020/01/29 05:30:14 thorpej Exp $ */
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -36,27 +36,27 @@
  */
 /*
  * Device driver for Alchemy Semiconductor Au1x00 Ethernet Media
  * Access Controller.
+ *
  * TODO:
+ *
  *	Better Rx buffer management; we want to get new Rx buffers
  *	to the chip more quickly than we currently do.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.47 2019/05/28 07:41:47 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.48 2020/01/29 05:30:14 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/intr.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 @@ -555,36 +555,38 @@ aumac_txintr(struct aumac_softc *sc)
 	     i = AUMAC_NEXTTX(i)) {
 		if ((bus_space_read_4(sc->sc_st, sc->sc_dma_sh,
 		     MACDMA_TX_ADDR(i)) & TX_ADDR_DN) == 0)
 			break;
 		pkts++;
 		/* ACK interrupt. */
 		bus_space_write_4(sc->sc_st, sc->sc_dma_sh,
 		    MACDMA_TX_ADDR(i), 0);
 		stat = bus_space_read_4(sc->sc_st, sc->sc_dma_sh,
 		    MACDMA_TX_STAT(i));
 		net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 		if (stat & TX_STAT_FA) {
 			/* XXX STATS */
-			ifp->if_oerrors++;
+			if_statinc_ref(nsr, if_oerrors);
 		} else
-			ifp->if_opackets++;
+			if_statinc_ref(nsr, if_opackets);
 		if (stat & TX_STAT_EC)
-			ifp->if_collisions += 16;
+			if_statadd_ref(nsr, if_collisions, 16);
-		else
+		else if (TX_STAT_CC(stat))
-			ifp->if_collisions += TX_STAT_CC(stat);
+			if_statadd_ref(nsr, if_collisions, TX_STAT_CC(stat));
 		IF_STAT_PUTREF(ifp);
 		sc->sc_txfree++;
 		ifp->if_flags &= ~IFF_OACTIVE;
 		/* Try to queue more packets. */
 		if_schedule_deferred_start(ifp);
+	}
 	if (pkts)
 		AUMAC_EVCNT_INCR(&sc->sc_ev_txintr);
 	/* Update the dirty descriptor pointer. */
 	sc->sc_txdirty = i;
 @@ -660,27 +662,27 @@ aumac_rxintr(struct aumac_softc *sc)
 			if (stat & RX_STAT_RF)
 				PRINTERR("runt frame (collision)");
 			if (stat & RX_STAT_WT)
 				PRINTERR("watch dog");
 			if (stat & RX_STAT_DB) {
 				if (stat & (RX_STAT_CS | RX_STAT_RF |
 				    RX_STAT_CR)) {
 					if (!error)
 						goto pktok;
 				} else
 					PRINTERR("dribbling bit");
+			}
 #undef PRINTERR
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
  dropit:
 			/* reuse the current descriptor */
 			AUMAC_INIT_RXDESC(sc, i);
 			continue;
+		}
  pktok:
 		len = RX_STAT_L(stat);
 		/*
 		 * The Au1X00 MAC includes the CRC with every packet;
 		 * trim it off here.
 		 */

 @@ -1,14 +1,14 @@
-/* $Id: if_ae.c,v 1.37 2019/09/13 07:55:06 msaitoh Exp $ */
+/* $Id: if_ae.c,v 1.38 2020/01/29 05:30:14 thorpej Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * This code was written by Garrett D'Amore for the Champaign-Urbana
  * Community Wireless Network Project.
+ *
  * 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.
 @@ -88,27 +88,27 @@
+ *
  * 1) Find out about BUS_MODE_ALIGN16B.  This chip can apparently align
  *    inbound packets on a half-word boundary, which would make life easier
  *    for TCP/IP.  (Aligning IP headers on a word.)
+ *
  * 2) There is stuff in original tulip to shut down the device when reacting
  *    to a change in link status.  Is that needed.
+ *
  * 3) Test with variety of 10/100 HDX/FDX scenarios.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.37 2019/09/13 07:55:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.38 2020/01/29 05:30:14 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/intr.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 @@ -774,27 +774,27 @@ ae_start(struct ifnet *ifp)
+ *
  *	Watchdog timer handler.
  */
 static void
 ae_watchdog(struct ifnet *ifp)
+{
 	struct ae_softc *sc = ifp->if_softc;
 	int doing_transmit;
 	doing_transmit = (! SIMPLEQ_EMPTY(&sc->sc_txdirtyq));
 	if (doing_transmit) {
 		printf("%s: transmit timeout\n", device_xname(sc->sc_dev));
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
+	}
 	else
 		printf("%s: spurious watchdog timeout\n", device_xname(sc->sc_dev));
 	(void) ae_init(ifp);
 	/* Try to get more packets going. */
 	ae_start(ifp);
+}
 /* If the interface is up and running, only modify the receive
  * filter when changing to/from promiscuous mode.  Otherwise return
  * ENETRESET so that ether_ioctl will reset the chip.
 @@ -1023,44 +1023,44 @@ ae_rxintr(struct ae_softc *sc)
 		rxstat = sc->sc_rxdescs[i].ad_status;
 		if (rxstat & ADSTAT_OWN) {
 			/*
 			 * We have processed all of the receive buffers.
 			 */
 			break;
+		}
 		/*
 		 * If any collisions were seen on the wire, count one.
 		 */
 		if (rxstat & ADSTAT_Rx_CS)
-			ifp->if_collisions++;
+			if_statinc(ifp, if_collisions);
 		/*
 		 * If an error occurred, update stats, clear the status
 		 * word, and leave the packet buffer in place.  It will
 		 * simply be reused the next time the ring comes around.
 	 	 * If 802.1Q VLAN MTU is enabled, ignore the Frame Too Long
 		 * error.
 		 */
 		if (rxstat & ADSTAT_ES &&
 		    ((sc->sc_ethercom.ec_capenable & ETHERCAP_VLAN_MTU) == 0 ||
 		     (rxstat & (ADSTAT_Rx_DE | ADSTAT_Rx_RF |
 				ADSTAT_Rx_DB | ADSTAT_Rx_CE)) != 0)) {
 #define	PRINTERR(bit, str)						\
 			if (rxstat & (bit))				\
 				printf("%s: receive error: %s\n",	\
 				    device_xname(sc->sc_dev), str)
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			PRINTERR(ADSTAT_Rx_DE, "descriptor error");
 			PRINTERR(ADSTAT_Rx_RF, "runt frame");
 			PRINTERR(ADSTAT_Rx_TL, "frame too long");
 			PRINTERR(ADSTAT_Rx_RE, "MII error");
 			PRINTERR(ADSTAT_Rx_DB, "dribbling bit");
 			PRINTERR(ADSTAT_Rx_CE, "CRC error");
 #undef PRINTERR
 			AE_INIT_RXDESC(sc, i);
 			continue;
+		}
 		bus_dmamap_sync(sc->sc_dmat, rxs->rxs_dmamap, 0,
 		    rxs->rxs_dmamap->dm_mapsize, BUS_DMASYNC_POSTREAD);
 @@ -1074,43 +1074,43 @@ ae_rxintr(struct ae_softc *sc)
 		/*
 		 * XXX: the Atheros part can align on half words.  what
 		 * is the performance implication of this?  Probably
 		 * minimal, and we should use it...
 		 */
 #ifdef __NO_STRICT_ALIGNMENT
 		/*
 		 * Allocate a new mbuf cluster.  If that fails, we are
 		 * out of memory, and must drop the packet and recycle
 		 * the buffer that's already attached to this descriptor.
 		 */
 		m = rxs->rxs_mbuf;
 		if (ae_add_rxbuf(sc, i) != 0) {
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			AE_INIT_RXDESC(sc, i);
 			bus_dmamap_sync(sc->sc_dmat, rxs->rxs_dmamap, 0,
 			    rxs->rxs_dmamap->dm_mapsize, BUS_DMASYNC_PREREAD);
 			continue;
+		}
 #else
 		/*
 		 * The chip's receive 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);
 			AE_INIT_RXDESC(sc, i);
 			bus_dmamap_sync(sc->sc_dmat, rxs->rxs_dmamap, 0,
 			    rxs->rxs_dmamap->dm_mapsize, BUS_DMASYNC_PREREAD);
 			continue;
+		}
 		MCLAIM(m, &sc->sc_ethercom.ec_rx_mowner);
 		if (len > (MHLEN - 2)) {
 			MCLGET(m, M_DONTWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_freem(m);
 				goto dropit;
+			}
+		}
 @@ -1206,37 +1206,40 @@ ae_txintr(struct ae_softc *sc)
 		 * Check for errors and collisions.
 		 */
 #ifdef AE_STATS
 		if (txstat & ADSTAT_Tx_UF)
 			sc->sc_stats.ts_tx_uf++;
 		if (txstat & ADSTAT_Tx_TO)
 			sc->sc_stats.ts_tx_to++;
 		if (txstat & ADSTAT_Tx_EC)
 			sc->sc_stats.ts_tx_ec++;
 		if (txstat & ADSTAT_Tx_LC)
 			sc->sc_stats.ts_tx_lc++;
 #endif
 		net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 		if (txstat & (ADSTAT_Tx_UF | ADSTAT_Tx_TO))
-			ifp->if_oerrors++;
+			if_statinc_ref(nsr, if_oerrors);
 		if (txstat & ADSTAT_Tx_EC)
-			ifp->if_collisions += 16;
+			if_statadd_ref(nsr, if_collisions, 16);
-		else
+		else if (ADSTAT_Tx_COLLISIONS(txstat))
-			ifp->if_collisions += ADSTAT_Tx_COLLISIONS(txstat);
+			if_statadd_ref(nsr, if_collisions,
 			    ADSTAT_Tx_COLLISIONS(txstat));
 		if (txstat & ADSTAT_Tx_LC)
-			ifp->if_collisions++;
+			if_statinc_ref(nsr, if_collisions);
-		ifp->if_opackets++;
+		if_statinc_ref(nsr, if_opackets);
 		IF_STAT_PUTREF(ifp);
+	}
 	/*
 	 * If there are no more pending transmissions, cancel the watchdog
 	 * timer.
 	 */
 	if (txs == NULL)
 		ifp->if_timer = 0;
+}
 #ifdef AE_STATS
 void
 ae_print_stats(struct ae_softc *sc)

 @@ -1,18 +1,18 @@
-/*	$NetBSD: if_cnmac.c,v 1.15 2019/12/28 02:58:59 gutteridge Exp $	*/
+/*	$NetBSD: if_cnmac.c,v 1.16 2020/01/29 05:30:14 thorpej Exp $	*/
 #include <sys/cdefs.h>
 #if 0
-__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.15 2019/12/28 02:58:59 gutteridge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.16 2020/01/29 05:30:14 thorpej Exp $");
 #endif
 #include "opt_octeon.h"
 #ifdef	OCTEON_ETH_DEBUG
 #ifndef DIAGNOSTIC
 #define	DIAGNOSTIC
 #endif
 #ifndef DEBUG
 #define	DEBUG
 #endif
 @@ -1477,34 +1477,34 @@ octeon_eth_recv(struct octeon_eth_softc
 	/* XXX XXX XXX */
 	OCTEON_ETH_KASSERT(sc != NULL);
 	OCTEON_ETH_KASSERT(work != NULL);
 	OCTEON_EVCNT_INC(sc, rx);
 	word2 = work[2];
 	ifp = &sc->sc_ethercom.ec_if;
 	OCTEON_ETH_KASSERT(ifp != NULL);
 	if (__predict_false(octeon_eth_recv_check(sc, word2) != 0)) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		result = 1;
 		octeon_eth_buf_free_work(sc, work, word2);
 		goto drop;
+	}
 	if (__predict_false(octeon_eth_recv_mbuf(sc, work, &m) != 0)) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		result = 1;
 		octeon_eth_buf_free_work(sc, work, word2);
 		goto drop;
+	}
 	/* work[0] .. work[3] may not be valid any more */
 	OCTEON_ETH_KASSERT(m != NULL);
 	octeon_ipd_offload(word2, m->m_data, &m->m_pkthdr.csum_flags);
 	/* XXX XXX XXX */
 	if (sc->sc_soft_req_cnt > sc->sc_soft_req_thresh) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: octeon_gmx.c,v 1.7 2020/01/25 19:20:24 thorpej Exp $	*/
+/*	$NetBSD: octeon_gmx.c,v 1.8 2020/01/29 05:30:14 thorpej Exp $	*/
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
  * 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.
 @@ -22,27 +22,27 @@
  * 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.
  */
 /*
  *  support GMX0 interface only
  *  take no thought for other GMX interface
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.7 2020/01/25 19:20:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.8 2020/01/29 05:30:14 thorpej Exp $");
 #include "opt_octeon.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/lock.h>
 #include <sys/cdefs.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 @@ -1061,42 +1061,44 @@ octeon_gmx_stats(struct octeon_gmx_port_
+{
 	struct ifnet *ifp = &sc->sc_port_ec->ec_if;
 	uint64_t tmp;
 	/*
 	 *  GMX0_RX0_STATS_PKTS is not count.
          *  input packet is counted when recepted packet in if_cnmac.
          */
 	/*
          *  GMX0_RX0_STATS_PKTS_BAD count is included
          *  receive error of work queue entry.
          *  this is not add to input packet errors of interface.
          */
-	ifp->if_iqdrops +=
+	net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
-	    (uint32_t)_GMX_PORT_RD8(sc, GMX0_RX0_STATS_PKTS_DRP);
+	if_statadd_ref(nsr, if_iqdrops,
-	ifp->if_opackets +=
+	    (uint32_t)_GMX_PORT_RD8(sc, GMX0_RX0_STATS_PKTS_DRP));
-	    (uint32_t)_GMX_PORT_RD8(sc, GMX0_TX0_STAT3);
+	if_statadd_ref(nsr, if_opackets,
 	    (uint32_t)_GMX_PORT_RD8(sc, GMX0_TX0_STAT3));
 	tmp = _GMX_PORT_RD8(sc, GMX0_TX0_STAT0);
-	ifp->if_oerrors +=
+	if_statadd_ref(nsr, if_oerrors,
-	    (uint32_t)tmp + ((uint32_t)(tmp >> 32) * 16);
+	    (uint32_t)tmp + ((uint32_t)(tmp >> 32) * 16));
-	ifp->if_collisions += (uint32_t)tmp;
+	if_statadd_ref(nsr, if_collisions, (uint32_t)tmp);
 	tmp = _GMX_PORT_RD8(sc, GMX0_TX0_STAT1);
-	ifp->if_collisions +=
+	if_statadd_ref(nsr, if_collisions,
-	    (uint32_t)tmp + (uint32_t)(tmp >> 32);
+	    (uint32_t)tmp + (uint32_t)(tmp >> 32));
 	tmp = _GMX_PORT_RD8(sc, GMX0_TX0_STAT9);
-	ifp->if_oerrors += (uint32_t)(tmp >> 32);
+	if_statadd_ref(nsr, if_oerrors, (uint32_t)(tmp >> 32));
 	IF_STAT_PUTREF(ifp);
+}
 /* ---- DMAC filter */
 #ifdef notyet
 /*
  * DMAC filter configuration
  *	accept all
  *	reject 0 addrs (virtually accept all?)
  *	reject N addrs
  *	accept N addrs
  *	accept 0 addrs (virtually reject all?)
  *	reject all

 @@ -1,14 +1,14 @@
-/*	$NetBSD: octeon_pip.c,v 1.2 2018/02/06 09:33:45 mrg Exp $	*/
+/*	$NetBSD: octeon_pip.c,v 1.3 2020/01/29 05:30:14 thorpej Exp $	*/
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
  * 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.
 @@ -17,27 +17,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 REGENTS 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(0, "$NetBSD: octeon_pip.c,v 1.2 2018/02/06 09:33:45 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_pip.c,v 1.3 2020/01/29 05:30:14 thorpej Exp $");
 #include "opt_octeon.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/time.h>
 #include <net/if.h>
 #include <mips/locore.h>
 #include <mips/cavium/octeonvar.h>
 #include <mips/cavium/dev/octeon_pipreg.h>
 #include <mips/cavium/dev/octeon_pipvar.h>
 @@ -235,27 +235,27 @@ octeon_pip_stats(struct octeon_pip_softc
 		panic("%s: invalid argument. sc=%p, ifp=%p\n", __func__,
 			sc, ifp);
 	if (gmx_port < 0 || gmx_port > 2) {
 		printf("%s: invalid gmx_port %d\n", __func__, gmx_port);
 		return;
+	}
 	pip_stat_ctl = _PIP_RD8(sc, PIP_STAT_CTL_OFFSET);
 	_PIP_WR8(sc, PIP_STAT_CTL_OFFSET, pip_stat_ctl | PIP_STAT_CTL_RDCLR);
 	reg = &octeon_pip_dump_stats_[gmx_port];
 	tmp = _PIP_RD8(sc, reg->offset);
 	pkts = (tmp & 0xffffffff00000000ULL) >> 32;
-	ifp->if_iqdrops += pkts;
+	if_statadd(ifp, if_iqdrops, pkts);
 	_PIP_WR8(sc, PIP_STAT_CTL_OFFSET, pip_stat_ctl);
+}
 #ifdef OCTEON_ETH_DEBUG
 int			octeon_pip_intr_rml_verbose;
 struct evcnt		octeon_pip_intr_evcnt;
 static const struct octeon_evcnt_entry octeon_pip_intr_evcnt_entries[] = {
 #define	_ENTRY(name, type, parent, descr) \
 	OCTEON_EVCNT_ENTRY(struct octeon_pip_softc, name, type, parent, descr)
 	_ENTRY(pipbeperr,	MISC, NULL, "pip parity error backend"),

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ralink_eth.c,v 1.19 2019/06/03 06:04:20 msaitoh Exp $	*/
+/*	$NetBSD: ralink_eth.c,v 1.20 2020/01/29 05:30:14 thorpej Exp $	*/
 /*-
  * Copyright (c) 2011 CradlePoint Technology, Inc.
  * 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.
 @@ -19,27 +19,27 @@
  * 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.
  */
 /* ralink_eth.c -- Ralink Ethernet Driver */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.19 2019/06/03 06:04:20 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.20 2020/01/29 05:30:14 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/intr.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 @@ -1311,27 +1311,27 @@ ralink_eth_start(struct ifnet *ifp)
 static void
 ralink_eth_watchdog(struct ifnet *ifp)
+{
 	RALINK_DEBUG_FUNC_ENTRY();
 	ralink_eth_softc_t * const sc = ifp->if_softc;
 	bool doing_transmit;
 	sc->sc_evcnt_watchdog.ev_count++;
 	doing_transmit = !SIMPLEQ_EMPTY(&sc->sc_txdirtyq);
 	if (doing_transmit) {
 		RALINK_DEBUG(RALINK_DEBUG_ERROR, "%s: transmit timeout\n",
 		    ifp->if_xname);
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		sc->sc_evcnt_wd_tx.ev_count++;
 	} else {
 		RALINK_DEBUG(RALINK_DEBUG_ERROR,
 		    "%s: spurious watchog timeout\n", ifp->if_xname);
 		sc->sc_evcnt_wd_spurious.ev_count++;
 		return;
+	}
 	sc->sc_evcnt_wd_reactivate.ev_count++;
 	const int s = splnet();
 	/* deactive the active partitions, retaining the active information */
 	ralink_eth_disable(sc);
 	ralink_eth_enable(sc);
 @@ -1616,27 +1616,27 @@ ralink_eth_txintr(ralink_eth_softc_t *sc
 		SIMPLEQ_REMOVE_HEAD(&sc->sc_txdirtyq, txs_q);
 		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);
 		m_freem(txs->txs_mbuf);
 		txs->txs_mbuf = NULL;
 		SIMPLEQ_INSERT_TAIL(&sc->sc_txfreeq, txs, txs_q);
 		struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 		ifp->if_flags &= ~IFF_OACTIVE;
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
 		sc->sc_evcnt_output.ev_count++;
 		if (--sc->sc_pending_tx == 0)
 			ifp->if_timer = 0;
+	}
+}
 /*
  * ralink_eth_mdio_enable
  */
 #if defined(RT3050) || defined(RT3052)
 static void
 ralink_eth_mdio_enable(ralink_eth_softc_t *sc, bool enable)

 @@ -1,14 +1,14 @@
-/* $NetBSD: sbmac.c,v 1.61 2019/09/13 07:55:06 msaitoh Exp $ */
+/* $NetBSD: sbmac.c,v 1.62 2020/01/29 05:30:14 thorpej Exp $ */
 /*
  * Copyright 2000, 2001, 2004
  * Broadcom Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and copied only
  * in accordance with the following terms and conditions.  Subject to these
  * conditions, you may download, copy, install, use, modify and distribute
  * modified or unmodified copies of this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce and
  *    retain this copyright notice and list of conditions as they appear in
 @@ -23,27 +23,27 @@
  *    WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
  *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
  *    NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
  *    FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
  *    LIABLE FOR 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), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.61 2019/09/13 07:55:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.62 2020/01/29 05:30:14 thorpej Exp $");
 #include "opt_inet.h"
 #include "opt_ns.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/queue.h>
 #include <sys/device.h>
 @@ -1006,27 +1006,27 @@ sbdma_tx_process(struct sbmac_softc *sc,
 		if (curidx == hwidx)
 			break;
 		/*
 		 * Otherwise, get the packet's mbuf ptr back
 		 */
 		m = d->sbdma_ctxtable[curidx];
 		d->sbdma_ctxtable[curidx] = NULL;
 		/*
 		 * for transmits we just free buffers and count packets.
 		 */
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
 		m_freem(m);
 		/*
 		 * .. and advance to the next buffer.
 		 */
 		d->sbdma_rem_index = SBDMA_NEXTBUF(d, d->sbdma_rem_index);
+	}
 	/*
 	 * Decide what to set the IFF_OACTIVE bit in the interface to.
 	 * It's supposed to reflect if the interface is actively
 	 * transmitting, but that's really hard to do quickly.