 @@ -1,14 +1,14 @@
-/*	$NetBSD: aic6915.c,v 1.40 2019/10/30 07:26:28 msaitoh Exp $	*/
+/*	$NetBSD: aic6915.c,v 1.41 2020/01/29 14:09:58 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 Adaptec AIC-6915 (``Starfire'')
  * 10/100 Ethernet controller.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.40 2019/10/30 07:26:28 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.41 2020/01/29 14:09:58 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>
 @@ -492,27 +492,27 @@ sf_start(struct ifnet *ifp)
+}
 /*
  * sf_watchdog:		[ifnet interface function]
+ *
  *	Watchdog timer handler.
  */
 static void
 sf_watchdog(struct ifnet *ifp)
+{
 	struct sf_softc *sc = ifp->if_softc;
 	printf("%s: device timeout\n", device_xname(sc->sc_dev));
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	(void) sf_init(ifp);
 	/* Try to get more packets going. */
 	sf_start(ifp);
+}
 /*
  * sf_ioctl:		[ifnet interface function]
+ *
  *	Handle control requests from the operator.
  */
 static int
 @@ -736,43 +736,43 @@ sf_rxintr(struct sf_softc *sc)
 		 * configured the Starfire to NOT transfer the CRC
 		 * with the packet.
 		 */
 		len = RCD_W0_Length(word0);
 #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 = ds->ds_mbuf;
 		if (sf_add_rxbuf(sc, rxidx) != 0) {
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			SF_INIT_RXDESC(sc, rxidx);
 			bus_dmamap_sync(sc->sc_dmat, ds->ds_dmamap, 0,
 			    ds->ds_dmamap->dm_mapsize, BUS_DMASYNC_PREREAD);
 			continue;
+		}
 #else
 		/*
 		 * The Starfire's receive buffer 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);
 			SF_INIT_RXDESC(sc, rxidx);
 			bus_dmamap_sync(sc->sc_dmat, ds->ds_dmamap, 0,
 			    ds->ds_dmamap->dm_mapsize, BUS_DMASYNC_PREREAD);
 			continue;
+		}
 		if (len > (MHLEN - 2)) {
 			MCLGET(m, M_DONTWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_freem(m);
 				goto dropit;
+			}
+		}
 		m->m_data += 2;
 @@ -836,39 +836,46 @@ sf_stats_update(struct sf_softc *sc)
+{
 	struct sf_stats stats;
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	uint32_t *p;
 	u_int i;
 	p = &stats.TransmitOKFrames;
 	for (i = 0; i < (sizeof(stats) / sizeof(uint32_t)); i++) {
 		*p++ = sf_genreg_read(sc,
 		    SF_STATS_BASE + (i * sizeof(uint32_t)));
 		sf_genreg_write(sc, SF_STATS_BASE + (i * sizeof(uint32_t)), 0);
+	}
-	ifp->if_opackets += stats.TransmitOKFrames;
+	net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
-	ifp->if_collisions += stats.SingleCollisionFrames +
+	if_statadd_ref(nsr, if_opackets, stats.TransmitOKFrames);
 	    stats.MultipleCollisionFrames;
-	ifp->if_oerrors += stats.TransmitAbortDueToExcessiveCollisions +
+	if_statadd_ref(nsr, if_collisions,
 	    stats.SingleCollisionFrames +
 	    stats.MultipleCollisionFrames);
 	if_statadd_ref(nsr, if_oerrors,
 	    stats.TransmitAbortDueToExcessiveCollisions +
 	    stats.TransmitAbortDueToExcessingDeferral +
-	    stats.FramesLostDueToInternalTransmitErrors;
+	    stats.FramesLostDueToInternalTransmitErrors);
-	ifp->if_ierrors += stats.ReceiveCRCErrors + stats.AlignmentErrors +
+	if_statadd_ref(nsr, if_ierrors,
 	    stats.ReceiveCRCErrors + stats.AlignmentErrors +
 	    stats.ReceiveFramesTooLong + stats.ReceiveFramesTooShort +
 	    stats.ReceiveFramesJabbersError +
-	    stats.FramesLostDueToInternalReceiveErrors;
+	    stats.FramesLostDueToInternalReceiveErrors);
 	IF_STAT_PUTREF(ifp);
+}
 /*
  * sf_reset:
+ *
  *	Perform a soft reset on the Starfire.
  */
 static void
 sf_reset(struct sf_softc *sc)
+{
 	int i;
 	sf_funcreg_write(sc, SF_GeneralEthernetCtrl, 0);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: an.c,v 1.72 2019/09/23 17:37:04 maxv Exp $	*/
+/*	$NetBSD: an.c,v 1.73 2020/01/29 14:09:58 thorpej Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -67,27 +67,27 @@
  * Aironet 4500/4800 802.11 PCMCIA/ISA/PCI driver for FreeBSD.
+ *
  * Written by Bill Paul <wpaul@ctr.columbia.edu>
  * Electrical Engineering Department
  * Columbia University, New York City
  */
 /*
  * Ported to NetBSD from FreeBSD by Atsushi Onoe at the San Diego
  * IETF meeting.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.72 2019/09/23 17:37:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.73 2020/01/29 14:09:58 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/callout.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/ucred.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 @@ -745,27 +745,27 @@ an_start(struct ifnet *ifp)
+		}
 		IFQ_POLL(&ifp->if_snd, m);
 		if (m == NULL) {
 			DPRINTF2(("an_start: no pending mbuf\n"));
 			break;
+		}
 		if (sc->sc_txd[cur].d_inuse) {
 			DPRINTF2(("an_start: %x/%d busy\n",
 			    sc->sc_txd[cur].d_fid, cur));
 			ifp->if_flags |= IFF_OACTIVE;
 			break;
+		}
 		IFQ_DEQUEUE(&ifp->if_snd, m);
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
 		bpf_mtap(ifp, m, BPF_D_OUT);
 		eh = mtod(m, struct ether_header *);
 		ni = ieee80211_find_txnode(ic, eh->ether_dhost);
 		if (ni == NULL) {
 			/* NB: ieee80211_find_txnode does stat+msg */
 			goto bad;
+		}
 		if ((m = ieee80211_encap(ic, m, ni)) == NULL)
 			goto bad;
 		ieee80211_free_node(ni);
 		bpf_mtap3(ic->ic_rawbpf, m, BPF_D_OUT);
 		wh = mtod(m, struct ieee80211_frame *);
 @@ -843,27 +843,27 @@ an_start(struct ifnet *ifp)
 		    fid, cur));
 		sc->sc_txd[cur].d_inuse = 1;
 		if (an_cmd(sc, AN_CMD_TX, fid)) {
 			printf("%s: xmit failed\n", ifp->if_xname);
 			sc->sc_txd[cur].d_inuse = 0;
 			continue;
+		}
 		sc->sc_tx_timer = 5;
 		ifp->if_timer = 1;
 		AN_INC(cur, AN_TX_RING_CNT);
 		sc->sc_txnext = cur;
 		continue;
 bad:
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		m_freem(m);
+	}
+}
 static int
 an_reset(struct an_softc *sc)
+{
 	DPRINTF(("an_reset\n"));
 	if (!sc->sc_enabled)
 		return ENXIO;
 @@ -881,27 +881,27 @@ an_reset(struct an_softc *sc)
+}
 static void
 an_watchdog(struct ifnet *ifp)
+{
 	struct an_softc *sc = ifp->if_softc;
 	if (!sc->sc_enabled)
 		return;
 	if (sc->sc_tx_timer) {
 		if (--sc->sc_tx_timer == 0) {
 			printf("%s: device timeout\n", ifp->if_xname);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			an_init(ifp);
 			return;
+		}
 		ifp->if_timer = 1;
+	}
 	ieee80211_watchdog(&sc->sc_ic);
+}
 static int
 an_ioctl(struct ifnet *ifp, u_long command, void *data)
+{
 	struct an_softc *sc = ifp->if_softc;
 	int s, error = 0;
 @@ -1380,94 +1380,94 @@ an_rx_intr(struct an_softc *sc)
 	struct ieee80211_frame_min *wh;
 	struct ieee80211_node *ni;
 	struct an_rxframe frmhdr;
 	struct mbuf *m;
 	u_int16_t status;
 	int fid, gaplen, len, off, s;
 	uint8_t *gap;
 	fid = CSR_READ_2(sc, AN_RX_FID);
 	/* First read in the frame header */
 	if (an_read_bap(sc, fid, 0, &frmhdr, sizeof(frmhdr)) != 0) {
 		CSR_WRITE_2(sc, AN_EVENT_ACK, AN_EV_RX);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		DPRINTF(("an_rx_intr: read fid %x failed\n", fid));
 		return;
+	}
 #ifdef AN_DEBUG
 	if ((ifp->if_flags & (IFF_DEBUG|IFF_LINK2)) == (IFF_DEBUG|IFF_LINK2)) {
 		ieee80211_dump_pkt((u_int8_t *)&frmhdr.an_whdr,
 		    sizeof(struct ieee80211_frame), frmhdr.an_rx_rate,
 		    frmhdr.an_rx_signal_strength);
 		printf(" time 0x%x status 0x%x plen %u chan %u"
 		    " plcp %02x %02x %02x %02x gap %u\n",
 		    le32toh(frmhdr.an_rx_time), le16toh(frmhdr.an_rx_status),
 		    le16toh(frmhdr.an_rx_payload_len), frmhdr.an_rx_chan,
 		    frmhdr.an_plcp_hdr[0], frmhdr.an_plcp_hdr[1],
 		    frmhdr.an_plcp_hdr[2], frmhdr.an_plcp_hdr[3],
 		    le16toh(frmhdr.an_gaplen));
+	}
 #endif
 	status = le16toh(frmhdr.an_rx_status);
 	if ((status & AN_STAT_ERRSTAT) != 0 &&
 	    ic->ic_opmode != IEEE80211_M_MONITOR) {
 		CSR_WRITE_2(sc, AN_EVENT_ACK, AN_EV_RX);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		DPRINTF(("an_rx_intr: fid %x status %x\n", fid, status));
 		return;
+	}
 	/* the payload length field includes a 16-bit "mystery field" */
 	len = le16toh(frmhdr.an_rx_payload_len) - sizeof(uint16_t);
 	off = ALIGN(sizeof(struct ieee80211_frame));
 	if (off + len > MCLBYTES) {
 		if (ic->ic_opmode != IEEE80211_M_MONITOR) {
 			CSR_WRITE_2(sc, AN_EVENT_ACK, AN_EV_RX);
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			DPRINTF(("an_rx_intr: oversized packet %d\n", len));
 			return;
+		}
 		len = 0;
+	}
 	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		CSR_WRITE_2(sc, AN_EVENT_ACK, AN_EV_RX);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		DPRINTF(("an_rx_intr: MGET failed\n"));
 		return;
+	}
 	if (off + len + AN_GAPLEN_MAX > MHLEN) {
 		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			CSR_WRITE_2(sc, AN_EVENT_ACK, AN_EV_RX);
 			m_freem(m);
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			DPRINTF(("an_rx_intr: MCLGET failed\n"));
 			return;
+		}
+	}
 	m->m_data += off - sizeof(struct ieee80211_frame);
 	if (ic->ic_opmode != IEEE80211_M_MONITOR) {
 		gaplen = le16toh(frmhdr.an_gaplen);
 		if (gaplen > AN_GAPLEN_MAX) {
 			CSR_WRITE_2(sc, AN_EVENT_ACK, AN_EV_RX);
 			m_freem(m);
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			DPRINTF(("%s: gap too long\n", __func__));
 			return;
+		}
 		/*
 		 * We don't need the 16-bit mystery field (payload length?),
 		 * so read it into the region reserved for the 802.11 header.
+		 *
 		 * When Cisco Aironet 350 cards w/ firmware version 5 or
 		 * greater operate with certain Cisco 350 APs,
 		 * the "gap" is filled with the SNAP header.  Read
 		 * it in after the 802.11 header.
 		 */
 		gap = m->m_data + sizeof(struct ieee80211_frame) -
 @@ -1539,29 +1539,29 @@ an_tx_intr(struct an_softc *sc, int stat
+{
 	struct ifnet *ifp = &sc->sc_if;
 	int cur, fid, s;
 	s = splnet();
 	sc->sc_tx_timer = 0;
 	ifp->if_flags &= ~IFF_OACTIVE;
 	fid = CSR_READ_2(sc, AN_TX_CMP_FID);
 	CSR_WRITE_2(sc, AN_EVENT_ACK, status & (AN_EV_TX | AN_EV_TX_EXC));
 	if (status & AN_EV_TX_EXC)
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 	else
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
 	cur = sc->sc_txcur;
 	if (sc->sc_txd[cur].d_fid == fid) {
 		sc->sc_txd[cur].d_inuse = 0;
 		DPRINTF2(("an_tx_intr: sent %x/%d\n", fid, cur));
 		AN_INC(cur, AN_TX_RING_CNT);
 		sc->sc_txcur = cur;
 	} else {
 		for (cur = 0; cur < AN_TX_RING_CNT; cur++) {
 			if (fid == sc->sc_txd[cur].d_fid) {
 				sc->sc_txd[cur].d_inuse = 0;
 				break;
+			}

 @@ -1,40 +1,40 @@
-/*	$NetBSD: arn5008.c,v 1.16 2019/11/10 21:16:35 chs Exp $	*/
+/*	$NetBSD: arn5008.c,v 1.17 2020/01/29 14:09:58 thorpej Exp $	*/
 /*	$OpenBSD: ar5008.c,v 1.21 2012/08/25 12:14:31 kettenis Exp $	*/
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
  * Copyright (c) 2008-2009 Atheros Communications Inc.
+ *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*
  * Driver for Atheros 802.11a/g/n chipsets.
  * Routines common to AR5008, AR9001 and AR9002 families.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.16 2019/11/10 21:16:35 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.17 2020/01/29 14:09:58 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 @@ -812,94 +812,94 @@ ar5008_rx_process(struct athn_softc *sc)
 		 * indication that the status words are corrupted, so
 		 * we skip this descriptor and drop the frame.
 		 */
 		nbf = SIMPLEQ_NEXT(bf, bf_list);
 		if (nbf != NULL &&
 		    (((struct ar_rx_desc *)nbf->bf_desc)->ds_status8 &
 		     AR_RXS8_DONE)) {
 			DPRINTFN(DBG_RX, sc,
 			    "corrupted descriptor status=0x%x\n",
 			    ds->ds_status8);
 			/* HW will not "move" RXDP in this case, so do it. */
 			AR_WRITE(sc, AR_RXDP, nbf->bf_daddr);
 			AR_WRITE_BARRIER(sc);
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			goto skip;
+		}
 		return EBUSY;
+	}
 	if (__predict_false(ds->ds_status1 & AR_RXS1_MORE)) {
 		/* Drop frames that span multiple Rx descriptors. */
 		DPRINTFN(DBG_RX, sc, "dropping split frame\n");
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	if (!(ds->ds_status8 & AR_RXS8_FRAME_OK)) {
 		if (ds->ds_status8 & AR_RXS8_CRC_ERR)
 			DPRINTFN(DBG_RX, sc, "CRC error\n");
 		else if (ds->ds_status8 & AR_RXS8_PHY_ERR)
 			DPRINTFN(DBG_RX, sc, "PHY error=0x%x\n",
 			    MS(ds->ds_status8, AR_RXS8_PHY_ERR_CODE));
 		else if (ds->ds_status8 & AR_RXS8_DECRYPT_CRC_ERR)
 			DPRINTFN(DBG_RX, sc, "Decryption CRC error\n");
 		else if (ds->ds_status8 & AR_RXS8_MICHAEL_ERR) {
 			DPRINTFN(DBG_RX, sc, "Michael MIC failure\n");
 			len = MS(ds->ds_status1, AR_RXS1_DATA_LEN);
 			m = bf->bf_m;
 			m_set_rcvif(m, ifp);
 			m->m_pkthdr.len = m->m_len = len;
 			wh = mtod(m, struct ieee80211_frame *);
 			/* Report Michael MIC failures to net80211. */
 			ieee80211_notify_michael_failure(ic, wh, 0 /* XXX: keyix */);
+		}
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	len = MS(ds->ds_status1, AR_RXS1_DATA_LEN);
 	if (__predict_false(len < (int)IEEE80211_MIN_LEN || len > ATHN_RXBUFSZ)) {
 		DPRINTFN(DBG_RX, sc, "corrupted descriptor length=%d\n", len);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	/* Allocate a new Rx buffer. */
 	m1 = MCLGETI(NULL, M_DONTWAIT, NULL, ATHN_RXBUFSZ);
 	if (__predict_false(m1 == NULL)) {
 		ic->ic_stats.is_rx_nobuf++;
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	/* Sync and unmap the old Rx buffer. */
 	bus_dmamap_sync(sc->sc_dmat, bf->bf_map, 0, ATHN_RXBUFSZ,
 	    BUS_DMASYNC_POSTREAD);
 	bus_dmamap_unload(sc->sc_dmat, bf->bf_map);
 	/* Map the new Rx buffer. */
 	error = bus_dmamap_load(sc->sc_dmat, bf->bf_map, mtod(m1, void *),
 	    ATHN_RXBUFSZ, NULL, BUS_DMA_NOWAIT | BUS_DMA_READ);
 	if (__predict_false(error != 0)) {
 		m_freem(m1);
 		/* Remap the old Rx buffer or panic. */
 		error = bus_dmamap_load(sc->sc_dmat, bf->bf_map,
 		    mtod(bf->bf_m, void *), ATHN_RXBUFSZ, NULL,
 		    BUS_DMA_NOWAIT | BUS_DMA_READ);
 		KASSERT(error != 0);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	bus_dmamap_sync(sc->sc_dmat, bf->bf_map, 0, ATHN_RXBUFSZ,
 	    BUS_DMASYNC_PREREAD);
 	/* Write physical address of new Rx buffer. */
 	ds->ds_data = bf->bf_map->dm_segs[0].ds_addr;
 	m = bf->bf_m;
 	bf->bf_m = m1;
 	/* Finalize mbuf. */
 @@ -975,32 +975,32 @@ ar5008_tx_process(struct athn_softc *sc,
 	struct ar_tx_desc *ds;
 	uint8_t failcnt;
 	bf = SIMPLEQ_FIRST(&txq->head);
 	if (bf == NULL)
 		return ENOENT;
 	/* Get descriptor of last DMA segment. */
 	ds = &((struct ar_tx_desc *)bf->bf_descs)[bf->bf_map->dm_nsegs - 1];
 	if (!(ds->ds_status9 & AR_TXS9_DONE))
 		return EBUSY;
 	SIMPLEQ_REMOVE_HEAD(&txq->head, bf_list);
-	ifp->if_opackets++;
+	if_statinc(ifp, if_opackets);
 	sc->sc_tx_timer = 0;
 	if (ds->ds_status1 & AR_TXS1_EXCESSIVE_RETRIES)
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 	if (ds->ds_status1 & AR_TXS1_UNDERRUN)
 		athn_inc_tx_trigger_level(sc);
 	an = (struct athn_node *)bf->bf_ni;
 	/*
 	 * NB: the data fail count contains the number of un-acked tries
 	 * for the final series used.  We must add the number of tries for
 	 * each series that was fully processed.
 	 */
 	failcnt  = MS(ds->ds_status1, AR_TXS1_DATA_FAIL_CNT);
 	/* NB: Assume two tries per series. */
 	failcnt += MS(ds->ds_status9, AR_TXS9_FINAL_IDX) * 2;
 @@ -1161,27 +1161,27 @@ ar5008_swba_intr(struct athn_softc *sc)
 			break;
 		IF_DEQUEUE(&ni->ni_savedq, m);
 		if (m == NULL)
 			break;
 		if (!IF_IS_EMPTY(&ni->ni_savedq)) {
 			/* more queued frames, set the more data bit */
 			wh = mtod(m, struct ieee80211_frame *);
 			wh->i_fc[1] |= IEEE80211_FC1_MORE_DATA;
+		}
 		if (sc->sc_ops.tx(sc, m, ni, ATHN_TXFLAG_CAB) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			break;
+		}
+	}
 	/* Kick Tx. */
 	AR_WRITE(sc, AR_Q_TXE, 1 << ATHN_QID_BEACON);
 	AR_WRITE_BARRIER(sc);
 	return 0;
+}
 #endif
 static int
 ar5008_get_intr_status(struct athn_softc *sc, uint32_t *intrp, uint32_t *syncp)

 @@ -1,40 +1,40 @@
-/*	$NetBSD: arn9003.c,v 1.14 2019/11/10 21:16:35 chs Exp $	*/
+/*	$NetBSD: arn9003.c,v 1.15 2020/01/29 14:09:58 thorpej Exp $	*/
 /*	$OpenBSD: ar9003.c,v 1.25 2012/10/20 09:53:32 stsp Exp $	*/
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
  * Copyright (c) 2010 Atheros Communications Inc.
+ *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*
  * Driver for Atheros 802.11a/g/n chipsets.
  * Routines for AR9003 family.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arn9003.c,v 1.14 2019/11/10 21:16:35 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arn9003.c,v 1.15 2020/01/29 14:09:58 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/callout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 @@ -975,63 +975,63 @@ ar9003_rx_process(struct athn_softc *sc,
 			DPRINTFN(DBG_RX, sc, "Michael MIC failure\n");
 			/* Report Michael MIC failures to net80211. */
 			len = MS(ds->ds_status2, AR_RXS2_DATA_LEN);
 			m = bf->bf_m;
 			m_set_rcvif(m, ifp);
 			m->m_data = (void *)&ds[1];
 			m->m_pkthdr.len = m->m_len = len;
 			wh = mtod(m, struct ieee80211_frame *);
 			ieee80211_notify_michael_failure(ic, wh,
 /* XXX: keyix */);
+		}
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	len = MS(ds->ds_status2, AR_RXS2_DATA_LEN);
 	if (__predict_false(len < IEEE80211_MIN_LEN ||
 	    len > ATHN_RXBUFSZ - sizeof(*ds))) {
 		DPRINTFN(DBG_RX, sc, "corrupted descriptor length=%zd\n",
 		    len);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	/* Allocate a new Rx buffer. */
 	m1 = MCLGETI(NULL, M_DONTWAIT, NULL, ATHN_RXBUFSZ);
 	if (__predict_false(m1 == NULL)) {
 		ic->ic_stats.is_rx_nobuf++;
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	/* Unmap the old Rx buffer. */
 	bus_dmamap_unload(sc->sc_dmat, bf->bf_map);
 	/* Map the new Rx buffer. */
 	error = bus_dmamap_load(sc->sc_dmat, bf->bf_map, mtod(m1, void *),
 	    ATHN_RXBUFSZ, NULL, BUS_DMA_NOWAIT | BUS_DMA_READ);
 	if (__predict_false(error != 0)) {
 		m_freem(m1);
 		/* Remap the old Rx buffer or panic. */
 		error = bus_dmamap_load(sc->sc_dmat, bf->bf_map,
 		    mtod(bf->bf_m, void *), ATHN_RXBUFSZ, NULL,
 		    BUS_DMA_NOWAIT | BUS_DMA_READ);
 		KASSERT(error != 0);
 		bf->bf_daddr = bf->bf_map->dm_segs[0].ds_addr;
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	bf->bf_desc = mtod(m1, struct ar_rx_status *);
 	bf->bf_daddr = bf->bf_map->dm_segs[0].ds_addr;
 	m = bf->bf_m;
 	bf->bf_m = m1;
 	/* Finalize mbuf. */
 	m_set_rcvif(m, ifp);
 	/* Strip Rx status descriptor from head. */
 	m->m_data = (void *)&ds[1];
 	m->m_pkthdr.len = m->m_len = len;
 @@ -1117,32 +1117,32 @@ ar9003_tx_process(struct athn_softc *sc)
 		memset(ds, 0, sizeof(*ds));
 		return 0;
+	}
 	/* Retrieve the queue that was used to send this PDU. */
 	qid = MS(ds->ds_info, AR_TXI_QCU_NUM);
 	txq = &sc->sc_txq[qid];
 	bf = SIMPLEQ_FIRST(&txq->head);
 	if (bf == NULL || bf == txq->wait) {
 		memset(ds, 0, sizeof(*ds));
 		return 0;
+	}
 	SIMPLEQ_REMOVE_HEAD(&txq->head, bf_list);
-	ifp->if_opackets++;
+	if_statinc(ifp, if_opackets);
 	sc->sc_tx_timer = 0;
 	if (ds->ds_status3 & AR_TXS3_EXCESSIVE_RETRIES)
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 	if (ds->ds_status3 & AR_TXS3_UNDERRUN)
 		athn_inc_tx_trigger_level(sc);
 	/* Wakeup PA predistortion state machine. */
 	if (bf->bf_txflags & ATHN_TXFLAG_PAPRD)
 		ar9003_paprd_tx_tone_done(sc);
 	an = (struct athn_node *)bf->bf_ni;
 	/*
 	 * NB: the data fail count contains the number of un-acked tries
 	 * for the final series used.  We must add the number of tries for
 	 * each series that was fully processed.
 @@ -1319,27 +1319,27 @@ ar9003_swba_intr(struct athn_softc *sc)
 			break;
 		IF_DEQUEUE(&ni->ni_savedq, m);
 		if (m == NULL)
 			break;
 		if (!IF_IS_EMPTY(&ni->ni_savedq)) {
 			/* more queued frames, set the more data bit */
 			wh = mtod(m, struct ieee80211_frame *);
 			wh->i_fc[1] |= IEEE80211_FC1_MORE_DATA;
+		}
 		if (sc->sc_ops.tx(sc, m, ni, ATHN_TXFLAG_CAB) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			break;
+		}
+	}
 	/* Kick Tx. */
 	AR_WRITE(sc, AR_Q_TXE, 1 << ATHN_QID_BEACON);
 	AR_WRITE_BARRIER(sc);
 	return 0;
+}
 #endif
 static int
 ar9003_get_intr_status(struct athn_softc *sc, uint32_t *intrp, uint32_t *syncp)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ath.c,v 1.129 2019/12/17 04:54:36 christos Exp $	*/
+/*	$NetBSD: ath.c,v 1.130 2020/01/29 14:09:58 thorpej Exp $	*/
 /*-
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
  * 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,
  *    without modification.
  * 2. Redistributions in binary form must reproduce at minimum a disclaimer
  *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
 @@ -31,27 +31,27 @@
  * 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 DAMAGES.
  */
 #include <sys/cdefs.h>
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.129 2019/12/17 04:54:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.130 2020/01/29 14:09:58 thorpej Exp $");
 #endif
 /*
  * Driver for the Atheros Wireless LAN controller.
+ *
  * This software is derived from work of Atsushi Onoe; his contribution
  * is greatly appreciated.
  */
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 @@ -1390,27 +1390,27 @@ ath_start(struct ifnet *ifp)
 				 * the frame back when the time is right.
 				 */
 				ieee80211_pwrsave(ic, ni, m);
 				goto reclaim;
+			}
 			/* calculate priority so we can find the tx queue */
 			if (ieee80211_classify(ic, m, ni)) {
 				DPRINTF(sc, ATH_DEBUG_XMIT,
 					"%s: discard, classification failure\n",
 					__func__);
 				m_freem(m);
 				goto bad;
+			}
-			ifp->if_opackets++;
+			if_statinc(ifp, if_opackets);
 			bpf_mtap(ifp, m, BPF_D_OUT);
 			/*
 			 * Encapsulate the packet in prep for transmission.
 			 */
 			m = ieee80211_encap(ic, m, ni);
 			if (m == NULL) {
 				DPRINTF(sc, ATH_DEBUG_XMIT,
 					"%s: encapsulation failure\n",
 					__func__);
 				sc->sc_stats.ast_tx_encap++;
 				goto bad;
+			}
 @@ -1452,27 +1452,27 @@ ath_start(struct ifnet *ifp)
 				/* XXX: adjust 100us delay to xmit */
 				tsf += 100;
 				tstamp = (u_int32_t *)&wh[1];
 				tstamp[0] = htole32(tsf & 0xffffffff);
 				tstamp[1] = htole32(tsf >> 32);
+			}
 			sc->sc_stats.ast_tx_mgmt++;
+		}
 	nextfrag:
 		next = m->m_nextpkt;
 		if (ath_tx_start(sc, ni, bf, m)) {
 	bad:
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 	reclaim:
 			ATH_TXBUF_LOCK(sc);
 			STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list);
 			ath_txfrag_cleanup(sc, &frags, ni);
 			ATH_TXBUF_UNLOCK(sc);
 			if (ni != NULL)
 				ieee80211_free_node(ni);
 			continue;
+		}
 		if (next != NULL) {
 			m = next;
 			bf = STAILQ_FIRST(&frags);
 			KASSERTMSG(bf != NULL, "no buf for txfrag");
 @@ -3156,27 +3156,27 @@ ath_rx_proc(void *arg, int npending)
 				/* XXX frag's and qos frames */
 				len = ds->ds_rxstat.rs_datalen;
 				if (len >= sizeof (struct ieee80211_frame)) {
 					bus_dmamap_sync(sc->sc_dmat,
 					    bf->bf_dmamap,
 , bf->bf_dmamap->dm_mapsize,
 					    BUS_DMASYNC_POSTREAD);
 					ath_handle_micerror(ic,
 					    mtod(m, struct ieee80211_frame *),
 					    sc->sc_splitmic ?
 						ds->ds_rxstat.rs_keyix-32 : ds->ds_rxstat.rs_keyix);
+				}
+			}
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			/*
 			 * Reject error frames, we normally don't want
 			 * to see them in monitor mode (in monitor mode
 			 * allow through packets that have crypto problems).
 			 */
 			if (ds->ds_rxstat.rs_status &~ (rxerr_tap|rxerr_mon))
 				goto rx_next;
+		}
 rx_accept:
 		/*
 		 * Sync and unmap the frame.  At this point we're
 		 * committed to passing the mbuf somewhere so clear
 @@ -5284,27 +5284,27 @@ ath_watchdog(struct ifnet *ifp)
 		if (!ATH_TXQ_SETUP(sc, i))
 			continue;
 		axq = &sc->sc_txq[i];
 		ATH_TXQ_LOCK(axq);
 		if (axq->axq_timer == 0)
+			;
 		else if (--axq->axq_timer == 0) {
 			ATH_TXQ_UNLOCK(axq);
 			if_printf(ifp, "device timeout (txq %d, "
 			    "txintrperiod %d)\n", i, sc->sc_txintrperiod);
 			if (sc->sc_txintrperiod > 1)
 				sc->sc_txintrperiod--;
 			ath_reset(ifp);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			sc->sc_stats.ast_watchdog++;
 			break;
 		} else
 			ifp->if_timer = 1;
 		ATH_TXQ_UNLOCK(axq);
+	}
 	ieee80211_watchdog(ic);
+}
 /*
  * Diagnostic interface to the HAL.  This is used by various
  * tools to do things like retrieve register contents for
  * debugging.  The mechanism is intentionally opaque so that
 @@ -5398,40 +5398,44 @@ ath_ioctl(struct ifnet *ifp, u_long cmd,
 			break;
 		case 0:
 			break;
+		}
 		break;
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
 		if ((error = ether_ioctl(ifp, cmd, data)) == ENETRESET) {
 			if (ifp->if_flags & IFF_RUNNING)
 				ath_mode_init(sc);
 			error = 0;
+		}
 		break;
-	case SIOCGATHSTATS:
+	case SIOCGATHSTATS: {
 		struct ath_stats stats_out;
 		struct if_data ifi;
 		/* NB: embed these numbers to get a consistent view */
 		sc->sc_stats.ast_tx_packets = ifp->if_opackets;
-		sc->sc_stats.ast_rx_packets = ifp->if_ipackets;
+		stats_out = sc->sc_stats;
-		sc->sc_stats.ast_rx_rssi = ieee80211_getrssi(ic);
+		stats_out.ast_rx_rssi = ieee80211_getrssi(ic);
 		splx(s);
 		/*
-		 * NB: Drop the softc lock in case of a page fault;
+		if_export_if_data(ifp, &ifi, false);
-		 * we'll accept any potential inconsisentcy in the
+		stats_out.ast_tx_packets = ifi.ifi_opackets;
-		 * statistics.  The alternative is to copy the data
+		stats_out.ast_rx_packets = ifi.ifi_ipackets;
 		 * to a local structure.
-		 */
+		return copyout(&stats_out,
-		return copyout(&sc->sc_stats,
+				ifr->ifr_data, sizeof (stats_out));
 				ifr->ifr_data, sizeof (sc->sc_stats));
 	case SIOCGATHDIAG:
 		error = kauth_authorize_network(curlwp->l_cred,
 		    KAUTH_NETWORK_INTERFACE,
 		    KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, KAUTH_ARG(cmd),
 		    NULL);
 		if (error)
 			break;
 		error = ath_ioctl_diag(sc, (struct ath_diag *) ifr);
 		break;
 	default:
 		error = ieee80211_ioctl(ic, cmd, data);
 		if (error != ENETRESET)
+			;

 @@ -1,39 +1,39 @@
-/*	$NetBSD: athn.c,v 1.22 2019/07/25 11:56:09 msaitoh Exp $	*/
+/*	$NetBSD: athn.c,v 1.23 2020/01/29 14:09:58 thorpej Exp $	*/
 /*	$OpenBSD: athn.c,v 1.83 2014/07/22 13:12:11 mpi Exp $	*/
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
  * Copyright (c) 2008-2010 Atheros Communications Inc.
+ *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*
  * Driver for Atheros 802.11a/g/n chipsets.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: athn.c,v 1.22 2019/07/25 11:56:09 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athn.c,v 1.23 2020/01/29 14:09:58 thorpej Exp $");
 #ifndef _MODULE
 #include "athn_usb.h"		/* for NATHN_USB */
 #endif
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 @@ -2661,69 +2661,69 @@ athn_start(struct ifnet *ifp)
 			ni = M_GETCTX(m, struct ieee80211_node *);
 			goto sendit;
+		}
 		if (ic->ic_state != IEEE80211_S_RUN)
 			break;
 		/* Encapsulate and send data frames. */
 		IFQ_DEQUEUE(&ifp->if_snd, m);
 		if (m == NULL)
 			break;
 		if (m->m_len < (int)sizeof(*eh) &&
 		    (m = m_pullup(m, sizeof(*eh))) == NULL) {
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
 		eh = mtod(m, struct ether_header *);
 		ni = ieee80211_find_txnode(ic, eh->ether_dhost);
 		if (ni == NULL) {
 			m_freem(m);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
 		bpf_mtap(ifp, m, BPF_D_OUT);
 		if ((m = ieee80211_encap(ic, m, ni)) == NULL)
 			continue;
  sendit:
 		bpf_mtap3(ic->ic_rawbpf, m, BPF_D_OUT);
 		if (sc->sc_ops.tx(sc, m, ni, 0) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
 		sc->sc_tx_timer = 5;
 		ifp->if_timer = 1;
+	}
+}
 Static void
 athn_watchdog(struct ifnet *ifp)
+{
 	struct athn_softc *sc = ifp->if_softc;
 	ifp->if_timer = 0;
 	if (sc->sc_tx_timer > 0) {
 		if (--sc->sc_tx_timer == 0) {
 			aprint_error_dev(sc->sc_dev, "device timeout\n");
 			/* see athn_init, no need to call athn_stop here */
 			/* athn_stop(ifp, 0); */
 			(void)athn_init(ifp);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			return;
+		}
 		ifp->if_timer = 1;
+	}
 	ieee80211_watchdog(&sc->sc_ic);
+}
 Static void
 athn_set_multi(struct athn_softc *sc)
+{
 	struct ethercom *ec = &sc->sc_ec;
 	struct ifnet *ifp = &ec->ec_if;
 	struct ether_multi *enm;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: atw.c,v 1.169 2019/11/10 21:16:35 chs Exp $  */
+/*	$NetBSD: atw.c,v 1.170 2020/01/29 14:09:58 thorpej Exp $  */
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by David Young, by Jason R. Thorpe, and by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Device driver for the ADMtek ADM8211 802.11 MAC/BBP.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.169 2019/11/10 21:16:35 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.170 2020/01/29 14:09:58 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/kauth.h>
 @@ -3143,27 +3143,27 @@ atw_rxintr(struct atw_softc *sc)
 			return;
+		}
 		/*
 		 * 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 ((rxstat & (ATW_RXSTAT_DE | ATW_RXSTAT_RXTOE)) != 0) {
 #define	PRINTERR(bit, str)						\
 			if (rxstat & (bit))				\
 				aprint_error_dev(sc->sc_dev, "receive error: %s\n",	\
 				    str)
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			PRINTERR(ATW_RXSTAT_DE, "descriptor error");
 			PRINTERR(ATW_RXSTAT_RXTOE, "time-out");
 #if 0
 			PRINTERR(ATW_RXSTAT_SFDE, "PLCP SFD error");
 			PRINTERR(ATW_RXSTAT_SIGE, "PLCP signal error");
 			PRINTERR(ATW_RXSTAT_CRC16E, "PLCP CRC16 error");
 			PRINTERR(ATW_RXSTAT_ICVE, "WEP ICV error");
 #endif
 #undef PRINTERR
 			atw_init_rxdesc(sc, i);
 			continue;
+		}
 @@ -3173,34 +3173,34 @@ atw_rxintr(struct atw_softc *sc)
 		/*
 		 * No errors; receive the packet.  Note the ADM8211
 		 * includes the CRC in promiscuous mode.
 		 */
 		len = __SHIFTOUT(rxstat, ATW_RXSTAT_FL_MASK);
 		/*
 		 * 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 (atw_add_rxbuf(sc, i) != 0) {
-			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);
 			atw_init_rxdesc(sc, i);
 			continue;
+		}
-		ifp->if_ipackets++;
+		if_statinc(ifp, if_ipackets);
 		m_set_rcvif(m, ifp);
 		m->m_pkthdr.len = m->m_len = MIN(m->m_ext.ext_size, len);
 		rate = (rate0 < __arraycount(rate_tbl)) ? rate_tbl[rate0] : 0;
 		/* The RSSI comes straight from a register in the
 		 * baseband processor.  I know that for the RF3000,
 		 * the RSSI register also contains the antenna-selection
 		 * bits.  Mask those off.
+		 *
 		 * TBD Treat other basebands.
 		 * TBD Use short-preamble bit and such in RF3000_RXSTAT.
 		 */
 @@ -3236,27 +3236,27 @@ atw_rxintr(struct atw_softc *sc)
 		if ((rxstat & (ATW_RXSTAT_CRC16E | ATW_RXSTAT_CRC32E |
 		    ATW_RXSTAT_ICVE | ATW_RXSTAT_SFDE | ATW_RXSTAT_SIGE))
 		    != 0) {
 			if (rxstat & ATW_RXSTAT_CRC16E)
 				sc->sc_crc16e_ev.ev_count++;
 			if (rxstat & ATW_RXSTAT_CRC32E)
 				sc->sc_crc32e_ev.ev_count++;
 			if (rxstat & ATW_RXSTAT_ICVE)
 				sc->sc_icve_ev.ev_count++;
 			if (rxstat & ATW_RXSTAT_SFDE)
 				sc->sc_sfde_ev.ev_count++;
 			if (rxstat & ATW_RXSTAT_SIGE)
 				sc->sc_sige_ev.ev_count++;
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			m_freem(m);
 			splx(s);
 			continue;
+		}
 		if (sc->sc_opmode & ATW_NAR_PR)
 			m_adj(m, -IEEE80211_CRC_LEN);
 		wh = mtod(m, struct ieee80211_frame_min *);
 		ni = ieee80211_find_rxnode(ic, wh);
 #if 0
 		if (atw_hw_decrypted(sc, wh)) {
 			wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
 @@ -3360,32 +3360,32 @@ atw_txintr(struct atw_softc *sc, uint32_
 		 */
 		if (txstat & ATW_TXSTAT_TUF)
 			sc->sc_tuf_ev.ev_count++;
 		if (txstat & ATW_TXSTAT_TLT)
 			sc->sc_tlt_ev.ev_count++;
 		if (txstat & ATW_TXSTAT_TRT)
 			sc->sc_trt_ev.ev_count++;
 		if (txstat & ATW_TXSTAT_TRO)
 			sc->sc_tro_ev.ev_count++;
 		if (txstat & ATW_TXSTAT_SOFBR)
 			sc->sc_sofbr_ev.ev_count++;
 		if ((txstat & ATW_TXSTAT_ES) == 0)
-			ifp->if_collisions +=
+			if_statadd(ifp, if_collisions,
-			    __SHIFTOUT(txstat, ATW_TXSTAT_ARC_MASK);
+			    __SHIFTOUT(txstat, ATW_TXSTAT_ARC_MASK));
 		else
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
+	}
 	KASSERT(txs != NULL || (ifp->if_flags & IFF_OACTIVE) == 0);
 	splx(s);
+}
 /*
  * atw_watchdog:	[ifnet interface function]
+ *
  *	Watchdog timer handler.
  */
 void
 @@ -3393,27 +3393,27 @@ atw_watchdog(struct ifnet *ifp)
+{
 	struct atw_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	ifp->if_timer = 0;
 	if (!device_is_active(sc->sc_dev))
 		return;
 	if (sc->sc_rescan_timer != 0 && --sc->sc_rescan_timer == 0)
 		(void)ieee80211_new_state(ic, IEEE80211_S_SCAN, -1);
 	if (sc->sc_tx_timer != 0 && --sc->sc_tx_timer == 0 &&
 	    !SIMPLEQ_EMPTY(&sc->sc_txdirtyq)) {
 		printf("%s: transmit timeout\n", ifp->if_xname);
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		(void)atw_init(ifp);
 		atw_start(ifp);
+	}
 	if (sc->sc_tx_timer != 0 || sc->sc_rescan_timer != 0)
 		ifp->if_timer = 1;
 	ieee80211_watchdog(ic);
+}
 static void
 atw_evcnt_detach(struct atw_softc *sc)
+{
 	evcnt_detach(&sc->sc_sige_ev);
 	evcnt_detach(&sc->sc_sfde_ev);
 @@ -3556,46 +3556,46 @@ atw_start(struct ifnet *ifp)
 		if (m0 != NULL) {
 			ni = M_GETCTX(m0, struct ieee80211_node *);
 			M_CLEARCTX(m0);
 		} else if (ic->ic_state != IEEE80211_S_RUN)
 			break; /* send no data until associated */
 		else {
 			IFQ_DEQUEUE(&ifp->if_snd, m0);
 			if (m0 == NULL)
 				break;
 			bpf_mtap(ifp, m0, BPF_D_OUT);
 			ni = ieee80211_find_txnode(ic,
 			    mtod(m0, struct ether_header *)->ether_dhost);
 			if (ni == NULL) {
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				break;
+			}
 			if ((m0 = ieee80211_encap(ic, m0, ni)) == NULL) {
 				ieee80211_free_node(ni);
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				break;
+			}
+		}
 		rate = MAX(ieee80211_get_rate(ni), 2);
 		whm = mtod(m0, struct ieee80211_frame_min *);
 		if ((whm->i_fc[1] & IEEE80211_FC1_WEP) == 0)
 			k = NULL;
 		else if ((k = ieee80211_crypto_encap(ic, ni, m0)) == NULL) {
 			m_freem(m0);
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			break;
+		}
 #if 0
 		if (IEEE80211_IS_MULTICAST(wh->i_addr1) &&
 		    m0->m_pkthdr.len > ic->ic_fragthreshold)
 			hdrctl |= htole16(ATW_HDRCTL_MORE_FRAG);
 #endif
 		if (m0->m_pkthdr.len + IEEE80211_CRC_LEN >= ic->ic_rtsthreshold)
 			hdrctl |= htole16(ATW_HDRCTL_RTSCTS);
 		if (ieee80211_compute_duration(whm, k, m0->m_pkthdr.len,
 		    ic->ic_flags, ic->ic_fragthreshold, rate,
 @@ -3620,35 +3620,35 @@ atw_start(struct ifnet *ifp)
 			tap->at_rate = rate;
 			bpf_mtap2(sc->sc_radiobpf, tap, sizeof(sc->sc_txtapu),
 			    m0, BPF_D_OUT);
+		}
 		M_PREPEND(m0, offsetof(struct atw_frame, atw_ihdr), M_DONTWAIT);
 		if (ni != NULL)
 			ieee80211_free_node(ni);
 		if (m0 == NULL) {
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			break;
+		}
 		/* just to make sure. */
 		m0 = m_pullup(m0, sizeof(struct atw_frame));
 		if (m0 == NULL) {
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			break;
+		}
 		hh = mtod(m0, struct atw_frame *);
 		wh = &hh->atw_ihdr;
 		/* Copy everything we need from the 802.11 header:
 		 * Frame Control; address 1, address 3, or addresses
 		 * 3 and 4. NIC fills in BSSID, SA.
 		 */
 		if (wh->i_fc[1] & IEEE80211_FC1_DIR_TODS) {
 			if (wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS)
 				panic("%s: illegal WDS frame",

 @@ -1,14 +1,14 @@
-/*	$NetBSD: awi.c,v 1.99 2019/12/05 03:11:40 msaitoh Exp $	*/
+/*	$NetBSD: awi.c,v 1.100 2020/01/29 14:09:58 thorpej Exp $	*/
 /*-
  * Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Bill Sommerfeld
+ *
  * 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.
 @@ -68,27 +68,27 @@
  */
 /*
  * Driver for AMD 802.11 PCnetMobile firmware.
  * Uses am79c930 chip driver to talk to firmware running on the am79c930.
+ *
  * The initial version of the driver was written by
  * Bill Sommerfeld <sommerfeld@NetBSD.org>.
  * Then the driver module completely rewritten to support cards with DS phy
  * and to support adhoc mode by Atsushi Onoe <onoe@NetBSD.org>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.99 2019/12/05 03:11:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.100 2020/01/29 14:09:58 thorpej Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/errno.h>
 #include <sys/endian.h>
 @@ -696,74 +696,74 @@ awi_start(struct ifnet *ifp)
 			if (!(ifp->if_flags & IFF_LINK0) && !sc->sc_adhoc_ap)
 				len += sizeof(struct llc) -
 				    sizeof(struct ether_header);
 			if (ic->ic_flags & IEEE80211_F_PRIVACY) {
 				dowep = 1;
 				len += IEEE80211_WEP_IVLEN +
 				    IEEE80211_WEP_KIDLEN + IEEE80211_WEP_CRCLEN;
+			}
 			if (awi_next_txd(sc, len, &frame, &ntxd)) {
 				ifp->if_flags |= IFF_OACTIVE;
 				break;
+			}
 			IFQ_DEQUEUE(&ifp->if_snd, m0);
-			ifp->if_opackets++;
+			if_statinc(ifp, if_opackets);
 			bpf_mtap(ifp, m0, BPF_D_OUT);
 			eh = mtod(m0, struct ether_header *);
 			ni = ieee80211_find_txnode(ic, eh->ether_dhost);
 			if (ni == NULL) {
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				continue;
+			}
 			if ((ifp->if_flags & IFF_LINK0) || sc->sc_adhoc_ap)
 				m0 = awi_ether_encap(sc, m0);
 			else {
 				m0 = ieee80211_encap(ic, m0, ni);
+			}
 			if (m0 == NULL) {
 				ieee80211_free_node(ni);
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				continue;
+			}
 			wh = mtod(m0, struct ieee80211_frame *);
 			if (!IEEE80211_IS_MULTICAST(wh->i_addr1) &&
 			    (ic->ic_opmode == IEEE80211_M_HOSTAP ||
 			     ic->ic_opmode == IEEE80211_M_IBSS) &&
 			    sc->sc_adhoc_ap == 0 &&
 			    (ifp->if_flags & IFF_LINK0) == 0 &&
 			    (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) ==
 			    IEEE80211_FC0_TYPE_DATA) {
 				m_freem(m0);
 				ieee80211_free_node(ni);
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				continue;
+			}
+		}
 		bpf_mtap3(ic->ic_rawbpf, m0, BPF_D_OUT);
 		if (dowep) {
 			if ((ieee80211_crypto_encap(ic, ni, m0)) == NULL) {
 				m_freem(m0);
 				ieee80211_free_node(ni);
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				continue;
+			}
+		}
 		ieee80211_free_node(ni);
 #ifdef DIAGNOSTIC
 		if (m0->m_pkthdr.len != len) {
 			printf("%s: length %d should be %d\n",
 			    sc->sc_if.if_xname, m0->m_pkthdr.len, len);
 			m_freem(m0);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
 #endif
 		if ((ifp->if_flags & IFF_DEBUG) && (ifp->if_flags & IFF_LINK2))
 			ieee80211_dump_pkt(m0->m_data, m0->m_len,
 			    ic->ic_bss->ni_rates.
 				rs_rates[ic->ic_bss->ni_txrate] &
 			    IEEE80211_RATE_VAL, -1);
 		for (m = m0, len = 0; m != NULL; m = m->m_next) {
 			awi_write_bytes(sc, frame + len, mtod(m, uint8_t *),
 			    m->m_len);
 @@ -796,27 +796,27 @@ awi_watchdog(struct ifnet *ifp)
 	ifp->if_timer = 0;
 	if (!sc->sc_enabled || !device_is_active(sc->sc_dev))
 		return;
 	ocansleep = sc->sc_cansleep;
 	sc->sc_cansleep = 0;
 	if (sc->sc_tx_timer) {
 		if (--sc->sc_tx_timer == 0) {
 			printf("%s: device timeout\n", ifp->if_xname);
 			prevdone = sc->sc_txdone;
 			awi_tx_int(sc);
 			if (sc->sc_txdone == prevdone) {
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				awi_init(ifp);
 				goto out;
+			}
+		}
 		ifp->if_timer = 1;
+	}
 	if (sc->sc_rx_timer) {
 		if (--sc->sc_rx_timer == 0) {
 			if (sc->sc_ic.ic_state == IEEE80211_S_RUN) {
 				ieee80211_new_state(&sc->sc_ic,
 				    IEEE80211_S_SCAN, -1);
 				goto out;
+			}
 @@ -1074,58 +1074,58 @@ awi_rx_int(struct awi_softc *sc)
 	uint16_t len;
 	uint32_t frame, next, rstamp, rxoff;
 	struct mbuf *m;
 	rxoff = sc->sc_rxdoff;
 	for (;;) {
 		state = awi_read_1(sc, rxoff + AWI_RXD_HOST_DESC_STATE);
 		if (state & AWI_RXD_ST_OWN)
 			break;
 		if (!(state & AWI_RXD_ST_CONSUMED)) {
 			if (sc->sc_substate != AWI_ST_NONE)
 				goto rx_next;
 			if (state & AWI_RXD_ST_RXERROR) {
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				goto rx_next;
+			}
 			len    = awi_read_2(sc, rxoff + AWI_RXD_LEN);
 			rate   = awi_read_1(sc, rxoff + AWI_RXD_RATE);
 			rssi   = awi_read_1(sc, rxoff + AWI_RXD_RSSI);
 			frame  = awi_read_4(sc, rxoff + AWI_RXD_START_FRAME) &
 x7fff;
 			rstamp = awi_read_4(sc, rxoff + AWI_RXD_LOCALTIME);
 			m = awi_devget(sc, frame, len);
 			if (m == NULL) {
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				goto rx_next;
+			}
 			if (state & AWI_RXD_ST_LF) {
 				/* TODO check my bss */
 				if (!(sc->sc_ic.ic_flags & IEEE80211_F_SIBSS) &&
 				    sc->sc_ic.ic_state == IEEE80211_S_RUN) {
 					sc->sc_rx_timer = 10;
 					ifp->if_timer = 1;
+				}
 				if ((ifp->if_flags & IFF_DEBUG) &&
 				    (ifp->if_flags & IFF_LINK2))
 					ieee80211_dump_pkt(m->m_data, m->m_len,
 					    rate / 5, rssi);
 				if ((ifp->if_flags & IFF_LINK0) ||
 				    sc->sc_adhoc_ap)
 					m = awi_ether_modcap(sc, m);
 				else
 					m = m_pullup(m, sizeof(*wh));
 				if (m == NULL) {
-					ifp->if_ierrors++;
+					if_statinc(ifp, if_ierrors);
 					goto rx_next;
+				}
 				wh = mtod(m, struct ieee80211_frame_min *);
 				ni = ieee80211_find_rxnode(ic, wh);
 				ieee80211_input(ic, m, ni, rssi, rstamp);
 				/*
 				 * The frame may have caused the
 				 * node to be marked for reclamation
 				 * (e.g. in response to a DEAUTH
 				 * message) so use release_node here
 				 * instead of unref_node.
 				 */
 				ieee80211_free_node(ni);
 @@ -1149,27 +1149,27 @@ awi_rx_int(struct awi_softc *sc)
+}
 static void
 awi_tx_int(struct awi_softc *sc)
+{
 	struct ifnet *ifp = &sc->sc_if;
 	uint8_t flags;
 	while (sc->sc_txdone != sc->sc_txnext) {
 		flags = awi_read_1(sc, sc->sc_txdone + AWI_TXD_STATE);
 		if ((flags & AWI_TXD_ST_OWN) || !(flags & AWI_TXD_ST_DONE))
 			break;
 		if (flags & AWI_TXD_ST_ERROR)
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 		sc->sc_txdone = awi_read_4(sc, sc->sc_txdone + AWI_TXD_NEXT) &
 x7fff;
+	}
 	DPRINTF2(("awi_txint: txdone %d txnext %d txbase %d txend %d\n",
 	    sc->sc_txdone, sc->sc_txnext, sc->sc_txbase, sc->sc_txend));
 	sc->sc_tx_timer = 0;
 	ifp->if_flags &= ~IFF_OACTIVE;
 	awi_start(ifp); /* in softint */
+}
 static struct mbuf *
 awi_devget(struct awi_softc *sc, uint32_t off, uint16_t len)
+{