 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_age.c,v 1.65 2019/12/01 08:16:49 msaitoh Exp $ */
+/*	$NetBSD: if_age.c,v 1.66 2020/01/30 13:59:24 thorpej Exp $ */
 /*	$OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.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 unmodified, this list of conditions, and the following
  *    disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -21,27 +21,27 @@
  * 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.
  */
 /* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.65 2019/12/01 08:16:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.66 2020/01/30 13:59:24 thorpej Exp $");
 #include "vlan.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 @@ -1069,40 +1069,40 @@ age_start(struct ifnet *ifp)
 		/* Set a timeout in case the chip goes out to lunch. */
 		ifp->if_timer = AGE_TX_TIMEOUT;
+	}
+}
 static void
 age_watchdog(struct ifnet *ifp)
+{
 	struct age_softc *sc = ifp->if_softc;
 	if ((sc->age_flags & AGE_FLAG_LINK) == 0) {
 		printf("%s: watchdog timeout (missed link)\n",
 		    device_xname(sc->sc_dev));
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		age_init(ifp);
 		return;
+	}
 	if (sc->age_cdata.age_tx_cnt == 0) {
 		printf("%s: watchdog timeout (missed Tx interrupts) "
 		    "-- recovering\n", device_xname(sc->sc_dev));
 		age_start(ifp);
 		return;
+	}
 	printf("%s: watchdog timeout\n", device_xname(sc->sc_dev));
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	age_init(ifp);
 	age_start(ifp);
+}
 static bool
 age_shutdown(device_t self, int howto)
+{
 	struct age_softc *sc;
 	struct ifnet *ifp;
 	sc = device_private(self);
 	ifp = &sc->sc_ec.ec_if;
 	age_stop(ifp, 1);
 @@ -1401,27 +1401,27 @@ age_rxeof(struct age_softc *sc, struct r
 		sc->age_cdata.age_rx_cons += nsegs;
 		sc->age_cdata.age_rx_cons %= AGE_RX_RING_CNT;
 		return;
+	}
 	pktlen = 0;
 	for (count = 0; count < nsegs; count++,
 	    AGE_DESC_INC(rx_cons, AGE_RX_RING_CNT)) {
 		rxd = &sc->age_cdata.age_rxdesc[rx_cons];
 		mp = rxd->rx_m;
 		desc = rxd->rx_desc;
 		/* Add a new receive buffer to the ring. */
 		if (age_newbuf(sc, rxd, 0) != 0) {
-			ifp->if_iqdrops++;
+			if_statinc(ifp, if_iqdrops);
 			/* Reuse Rx buffers. */
 			if (sc->age_cdata.age_rxhead != NULL) {
 				m_freem(sc->age_cdata.age_rxhead);
 				AGE_RXCHAIN_RESET(sc);
+			}
 			break;
+		}
 		/* The length of the first mbuf is computed last. */
 		if (count != 0) {
 			mp->m_len = AGE_RX_BYTES(le32toh(desc->len));
 			pktlen += mp->m_len;
+		}
 @@ -2023,40 +2023,47 @@ age_stats_update(struct age_softc *sc)
 	stat->tx_pkts_1519_max += smb->tx_pkts_1519_max;
 	stat->tx_single_colls += smb->tx_single_colls;
 	stat->tx_multi_colls += smb->tx_multi_colls;
 	stat->tx_late_colls += smb->tx_late_colls;
 	stat->tx_excess_colls += smb->tx_excess_colls;
 	stat->tx_underrun += smb->tx_underrun;
 	stat->tx_desc_underrun += smb->tx_desc_underrun;
 	stat->tx_lenerrs += smb->tx_lenerrs;
 	stat->tx_pkts_truncated += smb->tx_pkts_truncated;
 	stat->tx_bcast_bytes += smb->tx_bcast_bytes;
 	stat->tx_mcast_bytes += smb->tx_mcast_bytes;
 	/* Update counters in ifnet. */
-	ifp->if_opackets += smb->tx_frames;
+	net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
-	ifp->if_collisions += smb->tx_single_colls +
+	if_statadd_ref(nsr, if_opackets, smb->tx_frames);
 	if_statadd_ref(nsr, if_collisions,
 	    smb->tx_single_colls +
 	    smb->tx_multi_colls + smb->tx_late_colls +
-	    smb->tx_excess_colls * HDPX_CFG_RETRY_DEFAULT;
+	    smb->tx_excess_colls * HDPX_CFG_RETRY_DEFAULT);
-	ifp->if_oerrors += smb->tx_excess_colls +
+	if_statadd_ref(nsr, if_oerrors,
 	    smb->tx_excess_colls +
 	    smb->tx_late_colls + smb->tx_underrun +
-	    smb->tx_pkts_truncated;
+	    smb->tx_pkts_truncated);
-	ifp->if_ierrors += smb->rx_crcerrs + smb->rx_lenerrs +
+	if_statadd_ref(nsr, if_ierrors,
 	    smb->rx_crcerrs + smb->rx_lenerrs +
 	    smb->rx_runts + smb->rx_pkts_truncated +
 	    smb->rx_fifo_oflows + smb->rx_desc_oflows +
-	    smb->rx_alignerrs;
+	    smb->rx_alignerrs);
 	IF_STAT_PUTREF(ifp);
 	/* Update done, clear. */
 	smb->updated = 0;
 	bus_dmamap_sync(sc->sc_dmat, sc->age_cdata.age_smb_block_map, 0,
 	    sc->age_cdata.age_smb_block_map->dm_mapsize,
 	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+}
 static void
 age_stop_txmac(struct age_softc *sc)
+{
 	uint32_t reg;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_alc.c,v 1.46 2019/12/18 13:25:00 msaitoh Exp $	*/
+/*	$NetBSD: if_alc.c,v 1.47 2020/01/30 13:59:24 thorpej Exp $	*/
 /*	$OpenBSD: if_alc.c,v 1.1 2009/08/08 09:31:13 kevlo Exp $	*/
 /*-
  * Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.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 unmodified, 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
 @@ -2049,33 +2049,33 @@ alc_start(struct ifnet *ifp)
 		/* Set a timeout in case the chip goes out to lunch. */
 		ifp->if_timer = ALC_TX_TIMEOUT;
+	}
+}
 static void
 alc_watchdog(struct ifnet *ifp)
+{
 	struct alc_softc *sc = ifp->if_softc;
 	if ((sc->alc_flags & ALC_FLAG_LINK) == 0) {
 		printf("%s: watchdog timeout (missed link)\n",
 		    device_xname(sc->sc_dev));
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		alc_init_backend(ifp, false);
 		return;
+	}
 	printf("%s: watchdog timeout\n", device_xname(sc->sc_dev));
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	alc_init_backend(ifp, false);
 	alc_start(ifp);
+}
 static int
 alc_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct alc_softc *sc = ifp->if_softc;
 	int s, error = 0;
 	s = splnet();
 	switch (cmd) {
 @@ -2257,39 +2257,46 @@ alc_stats_update(struct alc_softc *sc)
 	stat->tx_pkts_1519_max += smb->tx_pkts_1519_max;
 	stat->tx_single_colls += smb->tx_single_colls;
 	stat->tx_multi_colls += smb->tx_multi_colls;
 	stat->tx_late_colls += smb->tx_late_colls;
 	stat->tx_excess_colls += smb->tx_excess_colls;
 	stat->tx_underrun += smb->tx_underrun;
 	stat->tx_desc_underrun += smb->tx_desc_underrun;
 	stat->tx_lenerrs += smb->tx_lenerrs;
 	stat->tx_pkts_truncated += smb->tx_pkts_truncated;
 	stat->tx_bcast_bytes += smb->tx_bcast_bytes;
 	stat->tx_mcast_bytes += smb->tx_mcast_bytes;
 	/* Update counters in ifnet. */
-	ifp->if_opackets += smb->tx_frames;
+	net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
-	ifp->if_collisions += smb->tx_single_colls +
+	if_statadd_ref(nsr, if_opackets, smb->tx_frames);
 	if_statadd_ref(nsr, if_collisions,
 	    smb->tx_single_colls +
 	    smb->tx_multi_colls * 2 + smb->tx_late_colls +
-	    smb->tx_excess_colls * HDPX_CFG_RETRY_DEFAULT;
+	    smb->tx_excess_colls * HDPX_CFG_RETRY_DEFAULT);
-	ifp->if_oerrors += smb->tx_late_colls + smb->tx_excess_colls +
+	if_statadd_ref(nsr, if_oerrors,
-	    smb->tx_underrun + smb->tx_pkts_truncated;
+	    smb->tx_late_colls + smb->tx_excess_colls +
 	    smb->tx_underrun + smb->tx_pkts_truncated);
-	ifp->if_ierrors += smb->rx_crcerrs + smb->rx_lenerrs +
+	if_statadd_ref(nsr, if_ierrors,
 	    smb->rx_crcerrs + smb->rx_lenerrs +
 	    smb->rx_runts + smb->rx_pkts_truncated +
 	    smb->rx_fifo_oflows + smb->rx_rrs_errs +
-	    smb->rx_alignerrs;
+	    smb->rx_alignerrs);
 	IF_STAT_PUTREF(ifp);
 	if ((sc->alc_flags & ALC_FLAG_SMB_BUG) == 0) {
 		/* Update done, clear. */
 		smb->updated = 0;
 		bus_dmamap_sync(sc->sc_dmat, sc->alc_cdata.alc_smb_map, 0,
 		sc->alc_cdata.alc_smb_map->dm_mapsize,
 		BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+	}
+}
 static int
 alc_intr(void *arg)
+{
 @@ -2541,27 +2548,27 @@ alc_rxeof(struct alc_softc *sc, struct r
 		 */
 		status |= RRD_TCP_UDPCSUM_NOK | RRD_IPCSUM_NOK;
 		if ((status & (RRD_ERR_CRC | RRD_ERR_ALIGN |
 		    RRD_ERR_TRUNC | RRD_ERR_RUNT)) != 0)
 			return;
+	}
 	for (count = 0; count < nsegs; count++,
 	    ALC_DESC_INC(rx_cons, ALC_RX_RING_CNT)) {
 		rxd = &sc->alc_cdata.alc_rxdesc[rx_cons];
 		mp = rxd->rx_m;
 		/* Add a new receive buffer to the ring. */
 		if (alc_newbuf(sc, rxd, false) != 0) {
-			ifp->if_iqdrops++;
+			if_statinc(ifp, if_iqdrops);
 			/* Reuse Rx buffers. */
 			if (sc->alc_cdata.alc_rxhead != NULL)
 				m_freem(sc->alc_cdata.alc_rxhead);
 			break;
+		}
 		/*
 		 * Assume we've received a full sized frame.
 		 * Actual size is fixed when we encounter the end of
 		 * multi-segmented frame.
 		 */
 		mp->m_len = sc->alc_buf_size;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ale.c,v 1.37 2019/12/01 08:16:49 msaitoh Exp $	*/
+/*	$NetBSD: if_ale.c,v 1.38 2020/01/30 13:59:24 thorpej Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.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 unmodified, 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
 @@ -22,27 +22,27 @@
  * 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/ale/if_ale.c,v 1.3 2008/12/03 09:01:12 yongari Exp $
  */
 /* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.37 2019/12/01 08:16:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.38 2020/01/30 13:59:24 thorpej Exp $");
 #include "vlan.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 @@ -1088,33 +1088,33 @@ ale_start(struct ifnet *ifp)
 		/* Set a timeout in case the chip goes out to lunch. */
 		ifp->if_timer = ALE_TX_TIMEOUT;
+	}
+}
 static void
 ale_watchdog(struct ifnet *ifp)
+{
 	struct ale_softc *sc = ifp->if_softc;
 	if ((sc->ale_flags & ALE_FLAG_LINK) == 0) {
 		printf("%s: watchdog timeout (missed link)\n",
 		    device_xname(sc->sc_dev));
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		ale_init(ifp);
 		return;
+	}
 	printf("%s: watchdog timeout\n", device_xname(sc->sc_dev));
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	ale_init(ifp);
 	if (!IFQ_IS_EMPTY(&ifp->if_snd))
 		ale_start(ifp);
+}
 static int
 ale_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct ale_softc *sc = ifp->if_softc;
 	int s, error;
 	s = splnet();
 @@ -1247,46 +1247,53 @@ ale_stats_update(struct ale_softc *sc)
 	stat->tx_single_colls += smb->tx_single_colls;
 	stat->tx_multi_colls += smb->tx_multi_colls;
 	stat->tx_late_colls += smb->tx_late_colls;
 	stat->tx_excess_colls += smb->tx_excess_colls;
 	stat->tx_abort += smb->tx_abort;
 	stat->tx_underrun += smb->tx_underrun;
 	stat->tx_desc_underrun += smb->tx_desc_underrun;
 	stat->tx_lenerrs += smb->tx_lenerrs;
 	stat->tx_pkts_truncated += smb->tx_pkts_truncated;
 	stat->tx_bcast_bytes += smb->tx_bcast_bytes;
 	stat->tx_mcast_bytes += smb->tx_mcast_bytes;
 	/* Update counters in ifnet. */
-	ifp->if_opackets += smb->tx_frames;
+	net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
-	ifp->if_collisions += smb->tx_single_colls +
+	if_statadd_ref(nsr, if_opackets, smb->tx_frames);
 	if_statadd_ref(nsr, if_collisions,
 	    smb->tx_single_colls +
 	    smb->tx_multi_colls * 2 + smb->tx_late_colls +
-	    smb->tx_abort * HDPX_CFG_RETRY_DEFAULT;
+	    smb->tx_abort * HDPX_CFG_RETRY_DEFAULT);
 	/*
 	 * XXX
 	 * tx_pkts_truncated counter looks suspicious. It constantly
 	 * increments with no sign of Tx errors. This may indicate
 	 * the counter name is not correct one so I've removed the
 	 * counter in output errors.
 	 */
-	ifp->if_oerrors += smb->tx_abort + smb->tx_late_colls +
+	if_statadd_ref(nsr, if_oerrors,
-	    smb->tx_underrun;
+	    smb->tx_abort + smb->tx_late_colls +
 	    smb->tx_underrun);
-	ifp->if_ierrors += smb->rx_crcerrs + smb->rx_lenerrs +
+	if_statadd_ref(nsr, if_ierrors,
 	    smb->rx_crcerrs + smb->rx_lenerrs +
 	    smb->rx_runts + smb->rx_pkts_truncated +
 	    smb->rx_fifo_oflows + smb->rx_rrs_errs +
-	    smb->rx_alignerrs;
+	    smb->rx_alignerrs);
 	IF_STAT_PUTREF(ifp);
+}
 static int
 ale_intr(void *xsc)
+{
 	struct ale_softc *sc = xsc;
 	struct ifnet *ifp = &sc->sc_ec.ec_if;
 	uint32_t status;
 	status = CSR_READ_4(sc, ALE_INTR_STATUS);
 	if ((status & ALE_INTRS) == 0)
 		return 0;
 @@ -1522,27 +1529,27 @@ ale_rxeof(struct ale_softc *sc)
+		}
 		/*
 		 * m_devget(9) is major bottle-neck of ale(4)(It comes
 		 * from hardware limitation). For jumbo frames we could
 		 * get a slightly better performance if driver use
 		 * m_getjcl(9) with proper buffer size argument. However
 		 * that would make code more complicated and I don't
 		 * think users would expect good Rx performance numbers
 		 * on these low-end consumer ethernet controller.
 		 */
 		m = m_devget((char *)(rs + 1), length - ETHER_CRC_LEN,
 , ifp);
 		if (m == NULL) {
-			ifp->if_iqdrops++;
+			if_statinc(ifp, if_iqdrops);
 			ale_rx_update_page(sc, &rx_page, length, &prod);
 			continue;
+		}
 		if (status & ALE_RD_IPV4)
 			ale_rxcsum(sc, m, status);
 #if NVLAN > 0
 		if (status & ALE_RD_VLAN) {
 			uint32_t vtags = ALE_RX_VLAN(le32toh(rs->vtags));
 			vlan_set_tag(m, ALE_RX_VLAN_TAG(vtags));
+		}
 #endif
 		/* Pass it to upper layer. */