 @@ -1,39 +1,39 @@
-/*	$NetBSD: if_otus.c,v 1.40 2020/01/15 08:20:13 skrll Exp $	*/
+/*	$NetBSD: if_otus.c,v 1.41 2020/01/29 06:35:28 thorpej Exp $	*/
 /*	$OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $	*/
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
+ *
  * Permission to use, copy, modify, and 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 AR9001U chipset.
  * http://www.atheros.com/pt/bulletins/AR9001USBBulletin.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.40 2020/01/15 08:20:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.41 2020/01/29 06:35:28 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/kthread.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 @@ -1724,69 +1724,69 @@ otus_sub_rxeof(struct otus_softc *sc, ui
+	}
 	plcp = buf;
 	/* All bits in the PLCP header are set to 1 for non-MPDU. */
 	if (memcmp(plcp, AR_PLCP_HDR_INTR, AR_PLCP_HDR_LEN) == 0) {
 		otus_cmd_rxeof(sc, plcp + AR_PLCP_HDR_LEN,
 		    len - AR_PLCP_HDR_LEN);
 		return;
+	}
 	/* Received MPDU. */
 	if (__predict_false(len < AR_PLCP_HDR_LEN + sizeof(*tail))) {
 		DPRINTFN(DBG_RX, sc, "MPDU too short %d\n", len);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	tail = (void *)(plcp + len - sizeof(*tail));
 	wh = (void *)(plcp + AR_PLCP_HDR_LEN);
 	/* Discard error frames. */
 	if (__predict_false((tail->error & sc->sc_rx_error_msk) != 0)) {
 		DPRINTFN(DBG_RX, sc, "error frame 0x%02x\n", tail->error);
 		if (tail->error & AR_RX_ERROR_FCS) {
 			DPRINTFN(DBG_RX, sc, "bad FCS\n");
 		} else if (tail->error & AR_RX_ERROR_MMIC) {
 			/* Report Michael MIC failures to net80211. */
 			ieee80211_notify_michael_failure(ic, wh, 0 /* XXX: keyix */);
+		}
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	/* Compute MPDU's length. */
 	mlen = len - AR_PLCP_HDR_LEN - sizeof(*tail);
 	mlen -= IEEE80211_CRC_LEN;	/* strip 802.11 FCS */
 	/* Make sure there's room for an 802.11 header. */
 	/*
 	 * XXX: This will drop most control packets.  Do we really
 	 * want this in IEEE80211_M_MONITOR mode?
 	 */
 	if (__predict_false(mlen < sizeof(*wh))) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	/* Provide a 32-bit aligned protocol header to the stack. */
 	align = (ieee80211_has_qos(wh) ^ ieee80211_has_addr4(wh)) ? 2 : 0;
 	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (__predict_false(m == NULL)) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	if (align + mlen > MHLEN) {
 		MCLGET(m, M_DONTWAIT);
 		if (__predict_false(!(m->m_flags & M_EXT))) {
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			m_freem(m);
 			return;
+		}
+	}
 	/* Finalize mbuf. */
 	m_set_rcvif(m, ifp);
 	m->m_data += align;
 	memcpy(mtod(m, void *), wh, mlen);
 	m->m_pkthdr.len = m->m_len = mlen;
 	s = splnet();
 	if (__predict_false(sc->sc_drvbpf != NULL)) {
 		struct otus_rx_radiotap_header *tap;
 @@ -1907,30 +1907,30 @@ otus_txeof(struct usbd_xfer *xfer, void
 	DPRINTFN(DBG_FN, sc, "\n");
 	/* Put this Tx buffer back to the free list. */
 	mutex_enter(&sc->sc_tx_mtx);
 	TAILQ_INSERT_TAIL(&sc->sc_tx_free_list, data, next);
 	mutex_exit(&sc->sc_tx_mtx);
 	ic = &sc->sc_ic;
 	ifp = ic->ic_ifp;
 	if (__predict_false(status != USBD_NORMAL_COMPLETION)) {
 		DPRINTFN(DBG_TX, sc, "TX status=%d\n", status);
 		if (status == USBD_STALLED)
 			usbd_clear_endpoint_stall_async(sc->sc_data_tx_pipe);
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		return;
+	}
-	ifp->if_opackets++;
+	if_statinc(ifp, if_opackets);
 	s = splnet();
 	sc->sc_tx_timer = 0;
 	ifp->if_flags &= ~IFF_OACTIVE;	/* XXX: do after freeing Tx buffer? */
 	otus_start(ifp);
 	splx(s);
+}
 Static int
 otus_tx(struct otus_softc *sc, struct mbuf *m, struct ieee80211_node *ni,
     struct otus_tx_data *data)
+{
 	struct ieee80211com *ic;
 @@ -2104,53 +2104,53 @@ otus_start(struct ifnet *ifp)
 			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) {
 			/* original m was freed by ieee80211_encap() */
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
  sendit:
 		bpf_mtap3(ic->ic_rawbpf, m, BPF_D_OUT);
 		if (otus_tx(sc, m, ni, data) != 0) {
 			m_freem(m);
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
 		data = NULL;	/* we're finished with this data buffer */
 		m_freem(m);
 		ieee80211_free_node(ni);
 		sc->sc_tx_timer = 5;
 		ifp->if_timer = 1;
+	}
 	/*
 	 * If here, we have a Tx buffer, but ran out of mbufs to
 	 * transmit.  Put the Tx buffer back to the free list.
 @@ -2165,27 +2165,27 @@ otus_watchdog(struct ifnet *ifp)
+{
 	struct otus_softc *sc;
 	sc = ifp->if_softc;
 	DPRINTFN(DBG_FN, sc, "\n");
 	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");
 			/* otus_init(ifp); XXX needs a process context! */
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			return;
+		}
 		ifp->if_timer = 1;
+	}
 	ieee80211_watchdog(&sc->sc_ic);
+}
 Static int
 otus_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct otus_softc *sc;
 	struct ieee80211com *ic;
 	int s, error = 0;

 @@ -1,40 +1,40 @@
 /*	$OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $	*/
-/*	$NetBSD: if_rum.c,v 1.65 2019/05/05 03:17:54 mrg Exp $	*/
+/*	$NetBSD: if_rum.c,v 1.66 2020/01/29 06:35:28 thorpej Exp $	*/
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
  * Copyright (c) 2006 Niall O'Higgins <niallo@openbsd.org>
+ *
  * Permission to use, copy, modify, and 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.
  */
 /*-
  * Ralink Technology RT2501USB/RT2601USB chipset driver
  * http://www.ralinktech.com.tw/
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.65 2019/05/05 03:17:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.66 2020/01/29 06:35:28 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/module.h>
 @@ -766,37 +766,37 @@ rum_txeof(struct usbd_xfer *xfer, void *
 	struct ifnet *ifp = &sc->sc_if;
 	int s;
 	if (status != USBD_NORMAL_COMPLETION) {
 		if (status == USBD_NOT_STARTED || status == USBD_CANCELLED)
 			return;
 		printf("%s: could not transmit buffer: %s\n",
 		    device_xname(sc->sc_dev), usbd_errstr(status));
 		if (status == USBD_STALLED)
 			usbd_clear_endpoint_stall_async(sc->sc_tx_pipeh);
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		return;
+	}
 	s = splnet();
 	ieee80211_free_node(data->ni);
 	data->ni = NULL;
 	sc->tx_queued--;
-	ifp->if_opackets++;
+	if_statinc(ifp, if_opackets);
 	DPRINTFN(10, ("tx done\n"));
 	sc->sc_tx_timer = 0;
 	ifp->if_flags &= ~IFF_OACTIVE;
 	rum_start(ifp);
 	splx(s);
+}
 static void
 rum_rxeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
+{
 @@ -815,56 +815,56 @@ rum_rxeof(struct usbd_xfer *xfer, void *
 			return;
 		if (status == USBD_STALLED)
 			usbd_clear_endpoint_stall_async(sc->sc_rx_pipeh);
 		goto skip;
+	}
 	usbd_get_xfer_status(xfer, NULL, NULL, &len, NULL);
 	if (len < (int)(RT2573_RX_DESC_SIZE +
 		        sizeof(struct ieee80211_frame_min))) {
 		DPRINTF(("%s: xfer too short %d\n", device_xname(sc->sc_dev),
 		    len));
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	desc = (struct rum_rx_desc *)data->buf;
 	if (le32toh(desc->flags) & RT2573_RX_CRC_ERROR) {
 		/*
 		 * This should not happen since we did not request to receive
 		 * those frames when we filled RT2573_TXRX_CSR0.
 		 */
 		DPRINTFN(5, ("CRC error\n"));
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	MGETHDR(mnew, M_DONTWAIT, MT_DATA);
 	if (mnew == NULL) {
 		printf("%s: could not allocate rx mbuf\n",
 		    device_xname(sc->sc_dev));
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	MCLGET(mnew, M_DONTWAIT);
 	if (!(mnew->m_flags & M_EXT)) {
 		printf("%s: could not allocate rx mbuf cluster\n",
 		    device_xname(sc->sc_dev));
 		m_freem(mnew);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	m = data->m;
 	data->m = mnew;
 	data->buf = mtod(data->m, uint8_t *);
 	/* finalize mbuf */
 	m_set_rcvif(m, ifp);
 	m->m_data = (void *)(desc + 1);
 	m->m_pkthdr.len = m->m_len = (le32toh(desc->flags) >> 16) & 0xfff;
 	s = splnet();
 @@ -1291,49 +1291,49 @@ rum_start(struct ifnet *ifp)
 			if (ni == NULL) {
 				m_freem(m0);
 				continue;
+			}
 			bpf_mtap(ifp, m0, BPF_D_OUT);
 			m0 = ieee80211_encap(ic, m0, ni);
 			if (m0 == NULL) {
 				ieee80211_free_node(ni);
 				continue;
+			}
 			bpf_mtap3(ic->ic_rawbpf, m0, BPF_D_OUT);
 			if (rum_tx_data(sc, m0, ni) != 0) {
 				ieee80211_free_node(ni);
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				break;
+			}
+		}
 		sc->sc_tx_timer = 5;
 		ifp->if_timer = 1;
+	}
+}
 static void
 rum_watchdog(struct ifnet *ifp)
+{
 	struct rum_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	ifp->if_timer = 0;
 	if (sc->sc_tx_timer > 0) {
 		if (--sc->sc_tx_timer == 0) {
 			printf("%s: device timeout\n", device_xname(sc->sc_dev));
 			/*rum_init(ifp); XXX needs a process context! */
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			return;
+		}
 		ifp->if_timer = 1;
+	}
 	ieee80211_watchdog(ic);
+}
 static int
 rum_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 #define IS_RUNNING(ifp) \
 	(((ifp)->if_flags & IFF_UP) && ((ifp)->if_flags & IFF_RUNNING))
 @@ -2248,27 +2248,27 @@ static void
 rum_amrr_update(struct usbd_xfer *xfer, void *priv,
     usbd_status status)
+{
 	struct rum_softc *sc = (struct rum_softc *)priv;
 	struct ifnet *ifp = sc->sc_ic.ic_ifp;
 	if (status != USBD_NORMAL_COMPLETION) {
 		printf("%s: could not retrieve Tx statistics - cancelling "
 		    "automatic rate control\n", device_xname(sc->sc_dev));
 		return;
+	}
 	/* count TX retry-fail as Tx errors */
-	ifp->if_oerrors += le32toh(sc->sta[5]) >> 16;
+	if_statadd(ifp, if_oerrors, le32toh(sc->sta[5]) >> 16);
 	sc->amn.amn_retrycnt =
 	    (le32toh(sc->sta[4]) >> 16) +	/* TX one-retry ok count */
 	    (le32toh(sc->sta[5]) & 0xffff) +	/* TX more-retry ok count */
 	    (le32toh(sc->sta[5]) >> 16);	/* TX retry-fail count */
 	sc->amn.amn_txcnt =
 	    sc->amn.amn_retrycnt +
 	    (le32toh(sc->sta[4]) & 0xffff);	/* TX no-retry ok count */
 	ieee80211_amrr_choose(&sc->amrr, sc->sc_ic.ic_bss, &sc->amn);
 	callout_reset(&sc->sc_amrr_ch, hz, rum_amrr_timeout, sc);

 @@ -1,39 +1,39 @@
-/*	$NetBSD: if_run.c,v 1.35 2020/01/04 22:30:06 mlelstv Exp $	*/
+/*	$NetBSD: if_run.c,v 1.36 2020/01/29 06:35:28 thorpej Exp $	*/
 /*	$OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $	*/
 /*-
  * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
+ *
  * Permission to use, copy, modify, and 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.
  */
 /*-
  * Ralink Technology RT2700U/RT2800U/RT3000U/RT3900E chipset driver.
  * http://www.ralinktech.com/
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.35 2020/01/04 22:30:06 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.36 2020/01/29 06:35:28 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 @@ -2147,27 +2147,27 @@ run_calibrate_cb(struct run_softc *sc, v
 	/* read statistic counters (clear on read) and update AMRR state */
 	error = run_read_region_1(sc, RT2860_TX_STA_CNT0, (uint8_t *)sta,
 	    sizeof(sta));
 	if (error != 0)
 		goto skip;
 	DPRINTF(("retrycnt=%d txcnt=%d failcnt=%d\n",
 	    le32toh(sta[1]) >> 16, le32toh(sta[1]) & 0xffff,
 	    le32toh(sta[0]) & 0xffff));
 	s = splnet();
 	/* count failed TX as errors */
-	ifp->if_oerrors += le32toh(sta[0]) & 0xffff;
+	if_statadd(ifp, if_oerrors, le32toh(sta[0]) & 0xffff);
 	sc->amn.amn_retrycnt =
 	    (le32toh(sta[0]) & 0xffff) +	/* failed TX count */
 	    (le32toh(sta[1]) >> 16);		/* TX retransmission count */
 	sc->amn.amn_txcnt =
 	    sc->amn.amn_retrycnt +
 	    (le32toh(sta[1]) & 0xffff);		/* successful TX count */
 	ieee80211_amrr_choose(&sc->amrr, sc->sc_ic.ic_bss, &sc->amn);
 	splx(s);
 skip:	callout_schedule(&sc->calib_to, hz);
 @@ -2256,62 +2256,62 @@ run_rx_frame(struct run_softc *sc, uint8
 		rxwisize += sizeof(uint64_t);
 	else if (sc->mac_ver == 0x3593)
 		rxwisize += sizeof(uint32_t);
 	len = le16toh(rxwi->len) & 0xfff;
 	if (__predict_false(len > dmalen)) {
 		DPRINTF(("bad RXWI length %u > %u\n", len, dmalen));
 		return;
+	}
 	/* Rx descriptor is located at the end */
 	rxd = (struct rt2870_rxd *)(buf + dmalen);
 	flags = le32toh(rxd->flags);
 	if (__predict_false(flags & (RT2860_RX_CRCERR | RT2860_RX_ICVERR))) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	wh = (struct ieee80211_frame *)(buf + rxwisize);
 	if (__predict_false((flags & RT2860_RX_MICERR))) {
 		/* report MIC failures to net80211 for TKIP */
 		ieee80211_notify_michael_failure(ic, wh, 0/* XXX */);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	if (flags & RT2860_RX_L2PAD) {
 		u_int hdrlen = ieee80211_hdrspace(ic, wh);
 		memmove((uint8_t *)wh + 2, wh, hdrlen);
 		wh = (struct ieee80211_frame *)((uint8_t *)wh + 2);
+	}
 #ifdef RUN_HWCRYPTO
 	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
 		wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
 		decrypted = 1;
+	}
 #endif
 	/* could use m_devget but net80211 wants contig mgmt frames */
 	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (__predict_false(m == NULL)) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	if (len > MHLEN) {
 		MCLGET(m, M_DONTWAIT);
 		if (__predict_false(!(m->m_flags & M_EXT))) {
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			m_freem(m);
 			return;
+		}
+	}
 	/* finalize mbuf */
 	m_set_rcvif(m, ifp);
 	memcpy(mtod(m, void *), wh, len);
 	m->m_pkthdr.len = m->m_len = len;
 	ant = run_maxrssi_chain(sc, rxwi);
 	rssi = rxwi->rssi[ant];
 	if (__predict_false(sc->sc_drvbpf != NULL)) {
 @@ -2454,33 +2454,33 @@ run_txeof(struct usbd_xfer *xfer, void *
 	s = splnet();
 	txq->queued--;
 	sc->qfullmsk &= ~(1 << data->qid);
 	if (__predict_false(status != USBD_NORMAL_COMPLETION)) {
 		if (status == USBD_NOT_STARTED || status == USBD_CANCELLED)
 			return;
 		DPRINTF(("%s: usb error on tx: %s\n",
 			device_xname(sc->sc_dev), usbd_errstr(status)));
 		if (status == USBD_STALLED)
 			usbd_clear_endpoint_stall_async(txq->pipeh);
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		splx(s);
 		return;
+	}
 	sc->sc_tx_timer = 0;
-	ifp->if_opackets++;
+	if_statinc(ifp, if_opackets);
 	ifp->if_flags &= ~IFF_OACTIVE;
 	run_start(ifp);
 	splx(s);
+}
 static int
 run_tx(struct run_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
+{
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct run_node *rn = (void *)ni;
 	struct ieee80211_frame *wh;
 #ifndef RUN_HWCRYPTO
 	struct ieee80211_key *k;
 @@ -2661,72 +2661,72 @@ run_start(struct ifnet *ifp)
 			ni = M_GETCTX(m, struct ieee80211_node *);
 			M_CLEARCTX(m);
 			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) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
 sendit:
 		bpf_mtap3(ic->ic_rawbpf, m, BPF_D_OUT);
 		if (run_tx(sc, m, ni) != 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
 run_watchdog(struct ifnet *ifp)
+{
 	struct run_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	ifp->if_timer = 0;
 	if (sc->sc_tx_timer > 0) {
 		if (--sc->sc_tx_timer == 0) {
 			device_printf(sc->sc_dev, "device timeout\n");
 			/* run_init(ifp); XXX needs a process context! */
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			return;
+		}
 		ifp->if_timer = 1;
+	}
 	ieee80211_watchdog(ic);
+}
 static int
 run_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct run_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_smsc.c,v 1.62 2020/01/07 06:42:26 maxv Exp $	*/
+/*	$NetBSD: if_smsc.c,v 1.63 2020/01/29 06:35:28 thorpej Exp $	*/
 /*	$OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
 /*-
  * Copyright (c) 2012
  *	Ben Gray <bgray@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, this list of conditions and the following disclaimer.
 @@ -51,27 +51,27 @@
  * the H/W checksum will be incorrect, however the rx code compensates for this.
+ *
  * TX checksuming is more complicated, the device requires a special header to
  * be prefixed onto the start of the frame which indicates the start and end
  * positions of the UDP or TCP frame.  This requires the driver to manually
  * go through the packet data and decode the headers prior to sending.
  * On Linux they generally provide cues to the location of the csum and the
  * area to calculate it over, on FreeBSD we seem to have to do it all ourselves,
  * hence this is not as optimal and therefore h/w TX checksum is currently not
  * implemented.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.62 2020/01/07 06:42:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.63 2020/01/29 06:35:28 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <dev/usb/usbnet.h>
 #include <dev/usb/usbhist.h>
 #include <dev/usb/if_smscreg.h>
 #include "ioconf.h"
 @@ -941,70 +941,70 @@ smsc_rx_loop(struct usbnet * un, struct
 	USMSCHIST_FUNC(); USMSCHIST_CALLED();
 	struct smsc_softc * const sc = usbnet_softc(un);
 	struct ifnet *ifp = usbnet_ifp(un);
 	uint8_t *buf = c->unc_buf;
 	usbnet_isowned_rx(un);
 	DPRINTF("total_len %jd/0x%jx", total_len, total_len, 0, 0);
 	while (total_len != 0) {
 		uint32_t rxhdr;
 		if (total_len < sizeof(rxhdr)) {
 			DPRINTF("total_len %jd < sizeof(rxhdr) %jd",
 			    total_len, sizeof(rxhdr), 0, 0);
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			return;
+		}
 		memcpy(&rxhdr, buf, sizeof(rxhdr));
 		rxhdr = le32toh(rxhdr);
 		buf += sizeof(rxhdr);
 		total_len -= sizeof(rxhdr);
 		if (rxhdr & SMSC_RX_STAT_COLLISION)
-			ifp->if_collisions++;
+			if_statinc(ifp, if_collisions);
 		if (rxhdr & (SMSC_RX_STAT_ERROR
 			   | SMSC_RX_STAT_LENGTH_ERROR
 			   | SMSC_RX_STAT_MII_ERROR)) {
 			DPRINTF("rx error (hdr 0x%08jx)", rxhdr, 0, 0, 0);
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			return;
+		}
 		uint16_t pktlen = (uint16_t)SMSC_RX_STAT_FRM_LENGTH(rxhdr);
 		DPRINTF("total_len %jd pktlen %jd rxhdr 0x%08jx", total_len,
 		    pktlen, rxhdr, 0);
 		if (pktlen < ETHER_HDR_LEN) {
 			DPRINTF("pktlen %jd < ETHER_HDR_LEN %jd", pktlen,
 			    ETHER_HDR_LEN, 0, 0);
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			return;
+		}
 		pktlen += ETHER_ALIGN;
 		if (pktlen > MCLBYTES) {
 			DPRINTF("pktlen %jd > MCLBYTES %jd", pktlen, MCLBYTES, 0,
 );
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			return;
+		}
 		if (pktlen > total_len) {
 			DPRINTF("pktlen %jd > total_len %jd", pktlen, total_len,
 , 0);
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			return;
+		}
 		uint8_t *pktbuf = buf + ETHER_ALIGN;
 		size_t buflen = pktlen - ETHER_ALIGN;
 		int mbuf_flags = M_HASFCS;
 		int csum_flags = 0;
 		uint16_t csum_data = 0;
  		KASSERT(pktlen < MCLBYTES);
 		/* Check if RX TCP/UDP checksumming is being offloaded */
 		if (sc->sc_coe_ctrl & SMSC_COE_CTRL_RX_EN) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_udav.c,v 1.73 2020/01/07 06:42:26 maxv Exp $	*/
+/*	$NetBSD: if_udav.c,v 1.74 2020/01/29 06:35:28 thorpej Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
 /*
  * Copyright (c) 2003
  *     Shingo WATANABE <nabe@nabechan.org>.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -35,27 +35,27 @@
  * DM9601(DAVICOM USB to Ethernet MAC Controller with Integrated 10/100 PHY)
  * The spec can be found at the following url.
  *   http://www.davicom.com.tw/big5/download/Data%20Sheet/DM9601-DS-F01-062202s.pdf
  */
 /*
  * TODO:
  *	Interrupt Endpoint support
  *	External PHYs
  *	powerhook() support?
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.73 2020/01/07 06:42:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.74 2020/01/29 06:35:28 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <dev/usb/usbnet.h>
 #include <dev/usb/if_udavreg.h>
 /* Function declarations */
 static int	udav_match(device_t, cfdata_t, void *);
 static void	udav_attach(device_t, device_t, void *);
 @@ -703,34 +703,34 @@ udav_rx_loop(struct usbnet *un, struct u
 	pktstat = *buf;
 	total_len -= sizeof(pktstat);
 	buf += sizeof(pktstat);
 	DPRINTF(("%s: RX Status: 0x%02x\n", device_xname(un->un_dev), pktstat));
 	pkt_len = UGETW(buf);
  	total_len -= sizeof(pkt_len);
 	buf += sizeof(pkt_len);
 	DPRINTF(("%s: RX Length: 0x%02x\n", device_xname(un->un_dev), pkt_len));
 	if (pktstat & UDAV_RSR_LCS) {
-		ifp->if_collisions++;
+		if_statinc(ifp, if_collisions);
 		return;
+	}
 	if (pkt_len < sizeof(struct ether_header) ||
 	    pkt_len > total_len ||
 	    (pktstat & UDAV_RSR_ERR)) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	pkt_len -= ETHER_CRC_LEN;
 	DPRINTF(("%s: Rx deliver: 0x%02x\n", device_xname(un->un_dev), pkt_len));
 	usbnet_enqueue(un, buf, pkt_len, 0, 0, 0);
+}
 static int
 udav_ioctl_cb(struct ifnet *ifp, u_long cmd, void *data)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_umb.c,v 1.10 2019/12/17 04:54:36 christos Exp $ */
+/*	$NetBSD: if_umb.c,v 1.11 2020/01/29 06:35:28 thorpej Exp $ */
 /*	$OpenBSD: if_umb.c,v 1.20 2018/09/10 17:00:45 gerhard Exp $ */
 /*
  * Copyright (c) 2016 genua mbH
  * All rights reserved.
+ *
  * Permission to use, copy, modify, and 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
 @@ -16,27 +16,27 @@
  * 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.
  */
 /*
  * Mobile Broadband Interface Model specification:
  * http://www.usb.org/developers/docs/devclass_docs/MBIM10Errata1_073013.zip
  * Compliance testing guide
  * http://www.usb.org/developers/docs/devclass_docs/MBIM-Compliance-1.0.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_umb.c,v 1.10 2019/12/17 04:54:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_umb.c,v 1.11 2020/01/29 06:35:28 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/rndsource.h>
 @@ -879,39 +879,38 @@ umb_output(struct ifnet *ifp, struct mbu
+}
 Static void
 umb_input(struct ifnet *ifp, struct mbuf *m)
+{
 	size_t pktlen = m->m_len;
 	int s;
 	if ((ifp->if_flags & IFF_UP) == 0) {
 		m_freem(m);
 		return;
+	}
 	if (pktlen < sizeof(struct ip)) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		DPRINTFN(4, "%s: dropping short packet (len %zd)\n", __func__,
 		    pktlen);
 		m_freem(m);
 		return;
+	}
 	s = splnet();
 	if (__predict_false(!pktq_enqueue(ip_pktq, m, 0))) {
-		ifp->if_iqdrops++;
+		if_statinc(ifp, if_iqdrops);
 		m_freem(m);
 	} else {
-		ifp->if_ipackets++;
+		if_statadd2(ifp, if_ipackets, 1, if_ibytes, pktlen);
 		ifp->if_ibytes += pktlen;
+	}
 	splx(s);
+}
 Static void
 umb_start(struct ifnet *ifp)
+{
 	struct umb_softc *sc = ifp->if_softc;
 	struct mbuf *m_head = NULL;
 	if (sc->sc_dying || (ifp->if_flags & IFF_OACTIVE))
 		return;
 @@ -929,27 +928,27 @@ umb_start(struct ifnet *ifp)
 	ifp->if_flags |= IFF_OACTIVE;
 	ifp->if_timer = (2 * umb_xfer_tout) / 1000;
+}
 Static void
 umb_watchdog(struct ifnet *ifp)
+{
 	struct umb_softc *sc = ifp->if_softc;
 	if (sc->sc_dying)
 		return;
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	printf("%s: watchdog timeout\n", DEVNAM(sc));
 	usbd_abort_pipe(sc->sc_tx_pipe);
 	return;
+}
 Static void
 umb_statechg_timeout(void *arg)
+{
 	struct umb_softc *sc = arg;
 	if (sc->sc_info.regstate != MBIM_REGSTATE_ROAMING || sc->sc_roaming)
 		printf("%s: state change timeout\n",DEVNAM(sc));
 	usb_add_task(sc->sc_udev, &sc->sc_umb_task, USB_TASKQ_DRIVER);
 @@ -1884,27 +1883,27 @@ umb_txeof(struct usbd_xfer *xfer, void *
 	struct umb_softc *sc = priv;
 	struct ifnet *ifp = GET_IFP(sc);
 	int	 s;
 	s = splnet();
 	ifp->if_flags &= ~IFF_OACTIVE;
 	ifp->if_timer = 0;
 	m_freem(sc->sc_tx_m);
 	sc->sc_tx_m = NULL;
 	if (status != USBD_NORMAL_COMPLETION) {
 		if (status != USBD_NOT_STARTED && status != USBD_CANCELLED) {
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			DPRINTF("%s: tx error: %s\n", DEVNAM(sc),
 			    usbd_errstr(status));
 			if (status == USBD_STALLED)
 				usbd_clear_endpoint_stall_async(sc->sc_tx_pipe);
+		}
+	}
 	if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
 		umb_start(ifp);
 	splx(s);
+}
 Static void
 @@ -2006,57 +2005,57 @@ umb_decap(struct umb_softc *sc, struct u
 			dlen = UGETW(dgram16->wDatagramLen);
 			doff = UGETW(dgram16->wDatagramIndex);
 			break;
 		case NCM_HDR32_SIG:
 			if (ptroff + dgentryoff < sizeof(*dgram32))
 				goto done;
 			dgram32 = (struct ncm_pointer32_dgram *)
 			    (buf + ptroff + dgentryoff);
 			dgentryoff += sizeof(*dgram32);
 			dlen = UGETDW(dgram32->dwDatagramLen);
 			doff = UGETDW(dgram32->dwDatagramIndex);
 			break;
 		default:
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			goto done;
+		}
 		/* Terminating zero entry */
 		if (dlen == 0 || doff == 0)
 			break;
 		if (len < dlen + doff) {
 			/* Skip giant datagram but continue processing */
 			DPRINTF("%s: datagram too large (%d @ off %d)\n",
 			    DEVNAM(sc), dlen, doff);
 			continue;
+		}
 		dp = buf + doff;
 		DPRINTFN(3, "%s: decap %d bytes\n", DEVNAM(sc), dlen);
 		m = m_devget(dp, dlen, 0, ifp);
 		if (m == NULL) {
-			ifp->if_iqdrops++;
+			if_statinc(ifp, if_iqdrops);
 			continue;
+		}
 		if_percpuq_enqueue((ifp)->if_percpuq, (m));
+	}
 done:
 	splx(s);
 	return;
 toosmall:
 	DPRINTF("%s: packet too small (%d)\n", DEVNAM(sc), len);
 fail:
-	ifp->if_ierrors++;
+	if_statinc(ifp, if_ierrors);
 	splx(s);
+}
 Static usbd_status
 umb_send_encap_command(struct umb_softc *sc, void *data, int len)
+{
 	struct usbd_xfer *xfer;
 	usb_device_request_t req;
 	char *buf;
 	if (len > sc->sc_ctrl_len)
 		return USBD_INVAL;

 @@ -1,34 +1,34 @@
-/*	$NetBSD: if_upgt.c,v 1.27 2020/01/15 08:20:13 skrll Exp $	*/
+/*	$NetBSD: if_upgt.c,v 1.28 2020/01/29 06:35:28 thorpej Exp $	*/
 /*	$OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
+ *
  * Permission to use, copy, modify, and 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.27 2020/01/15 08:20:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.28 2020/01/29 06:35:28 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 @@ -1481,27 +1481,27 @@ upgt_start(struct ifnet *ifp)
 		if (m != NULL) {
 			/* management frame */
 			IF_DEQUEUE(&ic->ic_mgtq, m);
 			ni = M_GETCTX(m, struct ieee80211_node *);
 			M_CLEARCTX(m);
 			bpf_mtap3(ic->ic_rawbpf, m, BPF_D_OUT);
 			if ((data_tx->addr = upgt_mem_alloc(sc)) == 0) {
 				aprint_error_dev(sc->sc_dev,
 				    "no free prism memory\n");
 				m_freem(m);
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				break;
+			}
 			data_tx->ni = ni;
 			data_tx->m = m;
 			sc->tx_queued++;
 		} else {
 			/* data frame */
 			if (ic->ic_state != IEEE80211_S_RUN)
 				break;
 			IFQ_POLL(&ifp->if_snd, m);
 			if (m == NULL)
 				break;
 @@ -1523,27 +1523,27 @@ upgt_start(struct ifnet *ifp)
 			m = ieee80211_encap(ic, m, ni);
 			if (m == NULL) {
 				ieee80211_free_node(ni);
 				continue;
+			}
 			bpf_mtap3(ic->ic_rawbpf, m, BPF_D_OUT);
 			if ((data_tx->addr = upgt_mem_alloc(sc)) == 0) {
 				aprint_error_dev(sc->sc_dev,
 				    "no free prism memory\n");
 				m_freem(m);
 				ieee80211_free_node(ni);
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				break;
+			}
 			data_tx->ni = ni;
 			data_tx->m = m;
 			sc->tx_queued++;
+		}
+	}
 	if (sc->tx_queued > 0) {
 		DPRINTF(2, "%s: tx_queued=%d\n",
 		    device_xname(sc->sc_dev), sc->tx_queued);
 		/* process the TX queue in process context */
 		ifp->if_timer = 5;
 @@ -1601,27 +1601,27 @@ upgt_tx_task(void *arg)
 		/*
 		 * Software crypto.
 		 */
 		wh = mtod(m, struct ieee80211_frame *);
 		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
 			k = ieee80211_crypto_encap(ic, data_tx->ni, m);
 			if (k == NULL) {
 				m_freem(m);
 				data_tx->m = NULL;
 				ieee80211_free_node(data_tx->ni);
 				data_tx->ni = NULL;
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				break;
+			}
 			/* in case packet header moved, reset pointer */
 			wh = mtod(m, struct ieee80211_frame *);
+		}
 		/*
 		 * Transmit the URB containing the TX data.
 		 */
 		memset(data_tx->buf, 0, sizeof(*mem) + sizeof(*txdesc));
 		mem = (struct upgt_lmac_mem *)data_tx->buf;
 @@ -1686,27 +1686,27 @@ upgt_tx_task(void *arg)
 		ieee80211_free_node(data_tx->ni);
 		data_tx->ni = NULL;
 		DPRINTF(2, "%s: TX start data sending\n",
 		    device_xname(sc->sc_dev));
 		usbd_setup_xfer(data_tx->xfer, data_tx, data_tx->buf, len,
 		    USBD_FORCE_SHORT_XFER, UPGT_USB_TIMEOUT, NULL);
 		error = usbd_transfer(data_tx->xfer);
 		if (error != USBD_NORMAL_COMPLETION &&
 		    error != USBD_IN_PROGRESS) {
 			aprint_error_dev(sc->sc_dev,
 			    "could not transmit TX data URB\n");
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			break;
+		}
 		DPRINTF(2, "%s: TX sent (%d bytes)\n",
 		    device_xname(sc->sc_dev), len);
+	}
 	splx(s);
 	/*
 	 * If we don't regulary read the device statistics, the RX queue
 	 * will stall.  It's strange, but it works, so we keep reading
 	 * the statistics here.  *shrug*
 @@ -1725,27 +1725,27 @@ upgt_tx_done(struct upgt_softc *sc, uint
 	s = splnet();
 	desc = (struct upgt_lmac_tx_done_desc *)data;
 	for (i = 0; i < UPGT_TX_COUNT; i++) {
 		struct upgt_data *data_tx = &sc->tx_data[i];
 		if (data_tx->addr == le32toh(desc->header2.reqid)) {
 			upgt_mem_free(sc, data_tx->addr);
 			data_tx->addr = 0;
 			sc->tx_queued--;
-			ifp->if_opackets++;
+			if_statinc(ifp, if_opackets);
 			DPRINTF(2, "%s: TX done: ", device_xname(sc->sc_dev));
 			DPRINTF(2, "memaddr=0x%08x, status=0x%04x, rssi=%d, ",
 			    le32toh(desc->header2.reqid),
 			    le16toh(desc->status),
 			    le16toh(desc->rssi));
 			DPRINTF(2, "seq=%d\n", le16toh(desc->seq));
 			break;
+		}
+	}
 	if (sc->tx_queued == 0) {
 		/* TX queued was processed, continue */
 @@ -1847,27 +1847,27 @@ upgt_rx(struct upgt_softc *sc, uint8_t *
 	struct ieee80211_frame *wh;
 	struct ieee80211_node *ni;
 	struct mbuf *m;
 	int s;
 	/* access RX packet descriptor */
 	rxdesc = (struct upgt_lmac_rx_desc *)data;
 	/* create mbuf which is suitable for strict alignment archs */
 	m = m_devget(rxdesc->data, pkglen, 0, ifp);
 	if (m == NULL) {
 		DPRINTF(1, "%s: could not create RX mbuf\n",
 		   device_xname(sc->sc_dev));
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	s = splnet();
 	if (sc->sc_drvbpf != NULL) {
 		struct upgt_rx_radiotap_header *tap = &sc->sc_rxtap;
 		tap->wr_flags = IEEE80211_RADIOTAP_F_FCS;
 		tap->wr_rate = upgt_rx_rate(sc, rxdesc->rate);
 		tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq);
 		tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags);
 		tap->wr_antsignal = rxdesc->rssi;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_upl.c,v 1.69 2020/01/07 06:42:26 maxv Exp $	*/
+/*	$NetBSD: if_upl.c,v 1.70 2020/01/29 06:35:28 thorpej Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * 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
 @@ -25,27 +25,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.
  */
 /*
  * Prolific PL2301/PL2302 driver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.69 2020/01/07 06:42:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.70 2020/01/29 06:35:28 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <dev/usb/usbnet.h>
 #include <net/if_types.h>
 #ifdef INET
 @@ -297,28 +297,27 @@ upl_output(struct ifnet *ifp, struct mbu
 	 */
 	return if_transmit_lock(ifp, m);
+}
 static void
 upl_input(struct ifnet *ifp, struct mbuf *m)
+{
 #ifdef INET
 	size_t pktlen = m->m_len;
 	int s;
 	s = splnet();
 	if (__predict_false(!pktq_enqueue(ip_pktq, m, 0))) {
-		ifp->if_iqdrops++;
+		if_statinc(ifp, if_iqdrops);
 		m_freem(m);
 	} else {
-		ifp->if_ipackets++;
+		if_statadd2(ifp, if_ipackets, 1, if_ibytes, pktlen);
 		ifp->if_ibytes += pktlen;
+	}
 	splx(s);
 #endif
+}
 #ifdef _MODULE
 #include "ioconf.c"
 #endif
 USBNET_MODULE(upl)

 @@ -1,40 +1,40 @@
-/*	$NetBSD: if_ural.c,v 1.61 2019/12/01 08:27:54 maxv Exp $ */
+/*	$NetBSD: if_ural.c,v 1.62 2020/01/29 06:35:28 thorpej Exp $ */
 /*	$FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $	*/
 /*-
  * Copyright (c) 2005, 2006
  *	Damien Bergamini <damien.bergamini@free.fr>
+ *
  * Permission to use, copy, modify, and 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.
  */
 /*-
  * Ralink Technology RT2500USB chipset driver
  * http://www.ralinktech.com/
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.61 2019/12/01 08:27:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.62 2020/01/29 06:35:28 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 @@ -856,39 +856,39 @@ ural_txeof(struct usbd_xfer *xfer, void
 	struct ifnet *ifp = &sc->sc_if;
 	int s;
 	if (status != USBD_NORMAL_COMPLETION) {
 		if (status == USBD_NOT_STARTED || status == USBD_CANCELLED)
 			return;
 		printf("%s: could not transmit buffer: %s\n",
 		    device_xname(sc->sc_dev), usbd_errstr(status));
 		if (status == USBD_STALLED)
 			usbd_clear_endpoint_stall_async(sc->sc_tx_pipeh);
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		return;
+	}
 	s = splnet();
 	m_freem(data->m);
 	data->m = NULL;
 	ieee80211_free_node(data->ni);
 	data->ni = NULL;
 	sc->tx_queued--;
-	ifp->if_opackets++;
+	if_statinc(ifp, if_opackets);
 	DPRINTFN(10, ("tx done\n"));
 	sc->sc_tx_timer = 0;
 	ifp->if_flags &= ~IFF_OACTIVE;
 	ural_start(ifp);
 	splx(s);
+}
 Static void
 ural_rxeof(struct usbd_xfer *xfer, void * priv, usbd_status status)
+{
 @@ -906,53 +906,53 @@ ural_rxeof(struct usbd_xfer *xfer, void
 		if (status == USBD_NOT_STARTED || status == USBD_CANCELLED)
 			return;
 		if (status == USBD_STALLED)
 			usbd_clear_endpoint_stall_async(sc->sc_rx_pipeh);
 		goto skip;
+	}
 	usbd_get_xfer_status(xfer, NULL, NULL, &len, NULL);
 	if (len < RAL_RX_DESC_SIZE + IEEE80211_MIN_LEN) {
 		DPRINTF(("%s: xfer too short %d\n", device_xname(sc->sc_dev),
 		    len));
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	/* rx descriptor is located at the end */
 	desc = (struct ural_rx_desc *)(data->buf + len - RAL_RX_DESC_SIZE);
 	if ((le32toh(desc->flags) & RAL_RX_PHY_ERROR) ||
 	    (le32toh(desc->flags) & RAL_RX_CRC_ERROR)) {
 		/*
 		 * This should not happen since we did not request to receive
 		 * those frames when we filled RAL_TXRX_CSR2.
 		 */
 		DPRINTFN(5, ("PHY or CRC error\n"));
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	MGETHDR(mnew, M_DONTWAIT, MT_DATA);
 	if (mnew == NULL) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	MCLGET(mnew, M_DONTWAIT);
 	if (!(mnew->m_flags & M_EXT)) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		m_freem(mnew);
 		goto skip;
+	}
 	m = data->m;
 	data->m = mnew;
 	data->buf = mtod(data->m, uint8_t *);
 	/* finalize mbuf */
 	m_set_rcvif(m, ifp);
 	m->m_pkthdr.len = m->m_len = (le32toh(desc->flags) >> 16) & 0xfff;
 	m->m_flags |= M_HASFCS;	/* h/w leaves FCS */
 @@ -1390,49 +1390,49 @@ ural_start(struct ifnet *ifp)
 			if (ni == NULL) {
 				m_freem(m0);
 				continue;
+			}
 			bpf_mtap(ifp, m0, BPF_D_OUT);
 			m0 = ieee80211_encap(ic, m0, ni);
 			if (m0 == NULL) {
 				ieee80211_free_node(ni);
 				continue;
+			}
 			bpf_mtap3(ic->ic_rawbpf, m0, BPF_D_OUT);
 			if (ural_tx_data(sc, m0, ni) != 0) {
 				ieee80211_free_node(ni);
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				break;
+			}
+		}
 		sc->sc_tx_timer = 5;
 		ifp->if_timer = 1;
+	}
+}
 Static void
 ural_watchdog(struct ifnet *ifp)
+{
 	struct ural_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	ifp->if_timer = 0;
 	if (sc->sc_tx_timer > 0) {
 		if (--sc->sc_tx_timer == 0) {
 			printf("%s: device timeout\n", device_xname(sc->sc_dev));
 			/*ural_init(sc); XXX needs a process context! */
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			return;
+		}
 		ifp->if_timer = 1;
+	}
 	ieee80211_watchdog(ic);
+}
 /*
  * This function allows for fast channel switching in monitor mode (used by
  * net-mgmt/kismet). In IBSS mode, we must explicitly reset the interface to
  * generate a new beacon frame.
  */
 @@ -2331,27 +2331,27 @@ ural_amrr_update(struct usbd_xfer *xfer,
     usbd_status status)
+{
 	struct ural_softc *sc = (struct ural_softc *)priv;
 	struct ifnet *ifp = sc->sc_ic.ic_ifp;
 	if (status != USBD_NORMAL_COMPLETION) {
 		printf("%s: could not retrieve Tx statistics - "
 		    "cancelling automatic rate control\n",
 		    device_xname(sc->sc_dev));
 		return;
+	}
 	/* count TX retry-fail as Tx errors */
-	ifp->if_oerrors += sc->sta[9];
+	if_statadd(ifp, if_oerrors, sc->sta[9]);
 	sc->amn.amn_retrycnt =
 	    sc->sta[7] +	/* TX one-retry ok count */
 	    sc->sta[8] +	/* TX more-retry ok count */
 	    sc->sta[9];		/* TX retry-fail count */
 	sc->amn.amn_txcnt =
 	    sc->amn.amn_retrycnt +
 	    sc->sta[6];		/* TX no-retry ok count */
 	ieee80211_amrr_choose(&sc->amrr, sc->sc_ic.ic_bss, &sc->amn);
 	callout_reset(&sc->sc_amrr_ch, hz, ural_amrr_timeout, sc);