 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ure.c,v 1.34 2020/01/07 06:42:26 maxv Exp $	*/
+/*	$NetBSD: if_ure.c,v 1.35 2020/01/29 06:39:07 thorpej Exp $	*/
 /*	$OpenBSD: if_ure.c,v 1.10 2018/11/02 21:32:30 jcs Exp $	*/
 /*-
  * Copyright (c) 2015-2016 Kevin Lo <kevlo@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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -20,27 +20,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /* RealTek RTL8152/RTL8153 10/100/Gigabit USB Ethernet device */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.34 2020/01/07 06:42:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.35 2020/01/29 06:39:07 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/cprng.h>
 #include <net/route.h>
 #include <dev/usb/usbnet.h>
 @@ -997,40 +997,40 @@ static void
 ure_rx_loop(struct usbnet *un, struct usbnet_chain *c, uint32_t total_len)
+{
 	struct ifnet *ifp = usbnet_ifp(un);
 	uint8_t *buf = c->unc_buf;
 	uint16_t pkt_len = 0;
 	uint16_t pkt_count = 0;
 	struct ure_rxpkt rxhdr;
 	usbnet_isowned_rx(un);
 	do {
 		if (total_len < sizeof(rxhdr)) {
 			DPRINTF(("too few bytes left for a packet header\n"));
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			return;
+		}
 		buf += roundup(pkt_len, 8);
 		memcpy(&rxhdr, buf, sizeof(rxhdr));
 		total_len -= sizeof(rxhdr);
 		pkt_len = le32toh(rxhdr.ure_pktlen) & URE_RXPKT_LEN_MASK;
 		DPRINTFN(4, ("next packet is %d bytes\n", pkt_len));
 		if (pkt_len > total_len) {
 			DPRINTF(("not enough bytes left for next packet\n"));
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			return;
+		}
 		total_len -= roundup(pkt_len, 8);
 		buf += sizeof(rxhdr);
 		usbnet_enqueue(un, buf, pkt_len - ETHER_CRC_LEN,
 			       ure_rxcsum(ifp, &rxhdr), 0, 0);
 		pkt_count++;
 	} while (total_len > 0);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_url.c,v 1.72 2020/01/07 06:42:26 maxv Exp $	*/
+/*	$NetBSD: if_url.c,v 1.73 2020/01/29 06:39:07 thorpej Exp $	*/
 /*
  * Copyright (c) 2001, 2002
  *     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
  *    documentation and/or other materials provided with the distribution.
 @@ -34,27 +34,27 @@
  * The RTL8150L(Realtek USB to fast ethernet controller) spec can be found at
  *   ftp://ftp.realtek.com.tw/lancard/data_sheet/8150/8150v14.pdf
  *   ftp://152.104.125.40/lancard/data_sheet/8150/8150v14.pdf
  */
 /*
  * TODO:
  *	Interrupt Endpoint support
  *	External PHYs
  *	powerhook() support?
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.72 2020/01/07 06:42:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.73 2020/01/29 06:39:07 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <net/if_ether.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_inarp.h>
 #endif
 @@ -566,42 +566,42 @@ url_tx_prepare(struct usbnet *un, struct
+}
 static void
 url_rx_loop(struct usbnet *un, struct usbnet_chain *c, uint32_t total_len)
+{
 	struct ifnet *ifp = usbnet_ifp(un);
 	url_rxhdr_t rxhdr;
 	usbnet_isowned_rx(un);
 	DPRINTF(("%s: %s: enter\n", device_xname(un->un_dev),__func__));
 	if (total_len <= ETHER_CRC_LEN || total_len <= sizeof(rxhdr)) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	memcpy(&rxhdr, c->unc_buf + total_len - ETHER_CRC_LEN, sizeof(rxhdr));
 	DPRINTF(("%s: RX Status: %dbytes%s%s%s%s packets\n",
 		 device_xname(un->un_dev),
 		 UGETW(rxhdr) & URL_RXHDR_BYTEC_MASK,
 		 UGETW(rxhdr) & URL_RXHDR_VALID_MASK ? ", Valid" : "",
 		 UGETW(rxhdr) & URL_RXHDR_RUNTPKT_MASK ? ", Runt" : "",
 		 UGETW(rxhdr) & URL_RXHDR_PHYPKT_MASK ? ", Physical match" : "",
 		 UGETW(rxhdr) & URL_RXHDR_MCASTPKT_MASK ? ", Multicast" : ""));
 	if ((UGETW(rxhdr) & URL_RXHDR_VALID_MASK) == 0) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	total_len -= ETHER_CRC_LEN;
 	DPRINTF(("%s: %s: deliver %d\n", device_xname(un->un_dev),
 		 __func__, total_len));
 	usbnet_enqueue(un, c->unc_buf, total_len, 0, 0, 0);
+}
 #if 0
 static void url_intr(void)
+{

 @@ -1,37 +1,37 @@
-/*	$NetBSD: if_urndis.c,v 1.35 2020/01/07 06:42:26 maxv Exp $ */
+/*	$NetBSD: if_urndis.c,v 1.36 2020/01/29 06:39:07 thorpej Exp $ */
 /*	$OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
 /*
  * Copyright (c) 2010 Jonathan Armani <armani@openbsd.org>
  * Copyright (c) 2010 Fabien Romano <fabien@openbsd.org>
  * Copyright (c) 2010 Michael Knudsen <mk@openbsd.org>
  * 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
  * 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_urndis.c,v 1.35 2020/01/07 06:42:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.36 2020/01/29 06:39:07 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <dev/usb/usbnet.h>
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/usbcdc.h>
 #include <dev/ic/rndisreg.h>
 @@ -810,27 +810,27 @@ urndis_rx_loop(struct usbnet * un, struc
 			printf("%s: urndis_decap invalid data "
 			    "len/offset/end_position(%u/%u/%u) -> "
 			    "go out of receive buffer limit %u\n",
 			    DEVNAME(un),
 			    le32toh(msg->rm_datalen),
 			    le32toh(msg->rm_dataoffset),
 			    le32toh(msg->rm_dataoffset) +
 			    le32toh(msg->rm_datalen) + (uint32_t)RNDIS_HEADER_OFFSET,
 			    le32toh(msg->rm_len));
 			return;
+		}
 		if (le32toh(msg->rm_datalen) < sizeof(struct ether_header)) {
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			printf("%s: urndis_decap invalid ethernet size "
 			    "%d < %zu\n",
 			    DEVNAME(un),
 			    le32toh(msg->rm_datalen),
 			    sizeof(struct ether_header));
 			return;
+		}
 		usbnet_enqueue(un,
 		    ((char*)&msg->rm_dataoffset + le32toh(msg->rm_dataoffset)),
 		    le32toh(msg->rm_datalen), 0, 0, 0);
 		offset += le32toh(msg->rm_len);

 @@ -1,35 +1,35 @@
-/*	$NetBSD: if_urtw.c,v 1.20 2019/11/28 17:09:10 maxv Exp $	*/
+/*	$NetBSD: if_urtw.c,v 1.21 2020/01/29 06:39:07 thorpej Exp $	*/
 /*	$OpenBSD: if_urtw.c,v 1.39 2011/07/03 15:47:17 matthew Exp $	*/
 /*-
  * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
  * Copyright (c) 2008 Weongyo Jeong <weongyo@FreeBSD.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_urtw.c,v 1.20 2019/11/28 17:09:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.21 2020/01/29 06:39:07 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 @@ -2479,46 +2479,46 @@ urtw_start(struct ifnet *ifp)
 				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 (urtw_tx_start(sc, ni, m0, URTW_PRIORITY_NORMAL)
 			    != 0) {
 				ieee80211_free_node(ni);
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				break;
+			}
+		}
 		sc->sc_txtimer = 5;
 		ifp->if_timer = 1;
+	}
+}
 static void
 urtw_watchdog(struct ifnet *ifp)
+{
 	struct urtw_softc *sc = ifp->if_softc;
 	ifp->if_timer = 0;
 	if (sc->sc_txtimer > 0) {
 		if (--sc->sc_txtimer == 0) {
 			printf("%s: device timeout\n", device_xname(sc->sc_dev));
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			return;
+		}
 		ifp->if_timer = 1;
+	}
 	ieee80211_watchdog(&sc->sc_ic);
+}
 static void
 urtw_txeof_low(struct usbd_xfer *xfer, void *priv,
     usbd_status status)
+{
 	struct urtw_tx_data *data = priv;
 @@ -2527,37 +2527,37 @@ urtw_txeof_low(struct usbd_xfer *xfer, v
 	struct ifnet *ifp = ic->ic_ifp;
 	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_txpipe_low);
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		return;
+	}
 	s = splnet();
 	ieee80211_free_node(data->ni);
 	data->ni = NULL;
 	sc->sc_txtimer = 0;
-	ifp->if_opackets++;
+	if_statinc(ifp, if_opackets);
 	sc->sc_tx_queued[URTW_PRIORITY_LOW]--;
 	ifp->if_flags &= ~IFF_OACTIVE;
 	urtw_start(ifp);
 	splx(s);
+}
 static void
 urtw_txeof_normal(struct usbd_xfer *xfer, void *priv,
     usbd_status status)
+{
 	struct urtw_tx_data *data = priv;
 @@ -2566,37 +2566,37 @@ urtw_txeof_normal(struct usbd_xfer *xfer
 	struct ifnet *ifp = ic->ic_ifp;
 	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_txpipe_normal);
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		return;
+	}
 	s = splnet();
 	ieee80211_free_node(data->ni);
 	data->ni = NULL;
 	sc->sc_txtimer = 0;
-	ifp->if_opackets++;
+	if_statinc(ifp, if_opackets);
 	sc->sc_tx_queued[URTW_PRIORITY_NORMAL]--;
 	ifp->if_flags &= ~IFF_OACTIVE;
 	urtw_start(ifp);
 	splx(s);
+}
 static int
 urtw_tx_start(struct urtw_softc *sc, struct ieee80211_node *ni, struct mbuf *m0,
     int prior)
+{
 	struct ieee80211com *ic = &sc->sc_ic;
 @@ -3063,81 +3063,81 @@ urtw_rxeof(struct usbd_xfer *xfer, void
 	struct ifnet *ifp = ic->ic_ifp;
 	struct ieee80211_frame *wh;
 	struct ieee80211_node *ni;
 	struct mbuf *m, *mnew;
 	uint8_t *desc, quality, rate;
 	int actlen, flen, len, rssi, s;
 	if (status != USBD_NORMAL_COMPLETION) {
 		if (status == USBD_NOT_STARTED || status == USBD_CANCELLED)
 			return;
 		if (status == USBD_STALLED)
 			usbd_clear_endpoint_stall_async(sc->sc_rxpipe);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	usbd_get_xfer_status(xfer, NULL, NULL, &actlen, NULL);
 	if (actlen < URTW_MIN_RXBUFSZ) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	if (sc->sc_hwrev & URTW_HWREV_8187)
 		/* 4 dword and 4 byte CRC */
 		len = actlen - (4 * 4);
 	else
 		/* 5 dword and 4 byte CRC */
 		len = actlen - (4 * 5);
 	desc = data->buf + len;
 	flen = ((desc[1] & 0x0f) << 8) + (desc[0] & 0xff);
 	if (flen > actlen) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	rate = (desc[2] & 0xf0) >> 4;
 	if (sc->sc_hwrev & URTW_HWREV_8187) {
 		quality = desc[4] & 0xff;
 		rssi = (desc[6] & 0xfe) >> 1;
 		/* XXX correct? */
 		if (!urtw_isbmode(rate)) {
 			rssi = (rssi > 90) ? 90 : ((rssi < 25) ? 25 : rssi);
 			rssi = ((90 - rssi) * 100) / 65;
 		} else {
 			rssi = (rssi > 90) ? 95 : ((rssi < 30) ? 30 : rssi);
 			rssi = ((95 - rssi) * 100) / 65;
+		}
 	} else {
 		quality = desc[12];
 		rssi = 14 - desc[14] / 2;
+	}
 	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(mnew, uint8_t *);
 	/* finalize mbuf */
 	m_set_rcvif(m, ifp);
 	m->m_pkthdr.len = m->m_len = flen - 4;
 	s = splnet();

 @@ -1,41 +1,41 @@
-/*	$NetBSD: if_urtwn.c,v 1.80 2020/01/15 08:20:13 skrll Exp $	*/
+/*	$NetBSD: if_urtwn.c,v 1.81 2020/01/29 06:39:07 thorpej Exp $	*/
 /*	$OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $	*/
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
  * Copyright (c) 2014 Kevin Lo <kevlo@FreeBSD.org>
  * Copyright (c) 2016 Nathanial Sloss <nathanialsloss@yahoo.com.au>
+ *
  * 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 Realtek RTL8188CE-VAU/RTL8188CUS/RTL8188EU/RTL8188RU/RTL8192CU
  * RTL8192EU.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.80 2020/01/15 08:20:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.81 2020/01/29 06:39:07 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #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>
 @@ -2370,77 +2370,77 @@ urtwn_rx_frame(struct urtwn_softc *sc, u
 	URTWNHIST_FUNC();
 	URTWNHIST_CALLARGS("buf=%jp, pktlen=%#jd", (uintptr_t)buf, pktlen, 0, 0);
 	stat = (struct r92c_rx_desc_usb *)buf;
 	rxdw0 = le32toh(stat->rxdw0);
 	rxdw3 = le32toh(stat->rxdw3);
 	if (__predict_false(rxdw0 & (R92C_RXDW0_CRCERR | R92C_RXDW0_ICVERR))) {
 		/*
 		 * This should not happen since we setup our Rx filter
 		 * to not receive these frames.
 		 */
 		DPRINTFN(DBG_RX, "CRC error", 0, 0, 0, 0);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	/*
 	 * XXX: This will drop most control packets.  Do we really
 	 * want this in IEEE80211_M_MONITOR mode?
 	 */
 //	if (__predict_false(pktlen < (int)sizeof(*wh))) {
 	if (__predict_false(pktlen < (int)sizeof(struct ieee80211_frame_ack))) {
 		DPRINTFN(DBG_RX, "packet too short %jd", pktlen, 0, 0, 0);
 		ic->ic_stats.is_rx_tooshort++;
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	if (__predict_false(pktlen > MCLBYTES)) {
 		DPRINTFN(DBG_RX, "packet too big %jd", pktlen, 0, 0, 0);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	rate = MS(rxdw3, R92C_RXDW3_RATE);
 	infosz = MS(rxdw0, R92C_RXDW0_INFOSZ) * 8;
 	/* Get RSSI from PHY status descriptor if present. */
 	if (infosz != 0 && (rxdw0 & R92C_RXDW0_PHYST)) {
 		if (!ISSET(sc->chip, URTWN_CHIP_92C))
 			rssi = urtwn_r88e_get_rssi(sc, rate, &stat[1]);
 		else
 			rssi = urtwn_get_rssi(sc, rate, &stat[1]);
 		/* Update our average RSSI. */
 		urtwn_update_avgrssi(sc, rate, rssi);
+	}
 	DPRINTFN(DBG_RX, "Rx frame len=%jd rate=%jd infosz=%jd rssi=%jd",
 	    pktlen, rate, infosz, rssi);
 	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (__predict_false(m == NULL)) {
 		aprint_error_dev(sc->sc_dev, "couldn't allocate rx mbuf\n");
 		ic->ic_stats.is_rx_nobuf++;
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	if (pktlen > (int)MHLEN) {
 		MCLGET(m, M_DONTWAIT);
 		if (__predict_false(!(m->m_flags & M_EXT))) {
 			aprint_error_dev(sc->sc_dev,
 			    "couldn't allocate rx mbuf cluster\n");
 			m_freem(m);
 			ic->ic_stats.is_rx_nobuf++;
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			return;
+		}
+	}
 	/* Finalize mbuf. */
 	m_set_rcvif(m, ifp);
 	wh = (struct ieee80211_frame *)((uint8_t *)&stat[1] + infosz);
 	memcpy(mtod(m, uint8_t *), wh, pktlen);
 	m->m_pkthdr.len = m->m_len = pktlen;
 	s = splnet();
 	if (__predict_false(sc->sc_drvbpf != NULL)) {
 		struct urtwn_rx_radiotap_header *tap = &sc->sc_rxtap;
 @@ -2588,33 +2588,33 @@ urtwn_txeof(struct usbd_xfer *xfer, void
 	mutex_exit(&sc->sc_tx_mtx);
 	s = splnet();
 	sc->tx_timer = 0;
 	ifp->if_flags &= ~IFF_OACTIVE;
 	if (__predict_false(status != USBD_NORMAL_COMPLETION)) {
 		if (status != USBD_NOT_STARTED && status != USBD_CANCELLED) {
 			if (status == USBD_STALLED) {
 				struct usbd_pipe *pipe = sc->tx_pipe[pidx];
 				usbd_clear_endpoint_stall_async(pipe);
+			}
 			printf("ERROR1\n");
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
+		}
 		splx(s);
 		return;
+	}
-	ifp->if_opackets++;
+	if_statinc(ifp, if_opackets);
 	urtwn_start(ifp);
 	splx(s);
+}
 static int
 urtwn_tx(struct urtwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni,
     struct urtwn_tx_data *data)
+{
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *k = NULL;
 	struct r92c_tx_desc_usb *txd;
 @@ -2881,78 +2881,78 @@ urtwn_start(struct ifnet *ifp)
+		}
 		data = urtwn_get_tx_data(sc, sc->ac2idx[qid]);
 		if (data == NULL) {
 			ifp->if_flags |= IFF_OACTIVE;
 			DPRINTFN(DBG_TX, "empty tx_free_list", 0, 0, 0, 0);
 			return;
+		}
 		IFQ_DEQUEUE(&ifp->if_snd, m);
 		if (m->m_len < (int)sizeof(*eh) &&
 		    (m = m_pullup(m, sizeof(*eh))) == NULL) {
 			printf("ERROR6\n");
-			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);
 			printf("ERROR5\n");
-			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);
 			printf("ERROR4\n");
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
  sendit:
 		bpf_mtap3(ic->ic_rawbpf, m, BPF_D_OUT);
 		if (urtwn_tx(sc, m, ni, data) != 0) {
 			m_freem(m);
 			ieee80211_free_node(ni);
 			printf("ERROR3\n");
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
 		m_freem(m);
 		ieee80211_free_node(ni);
 		sc->tx_timer = 5;
 		ifp->if_timer = 1;
+	}
+}
 static void
 urtwn_watchdog(struct ifnet *ifp)
+{
 	struct urtwn_softc *sc = ifp->if_softc;
 	URTWNHIST_FUNC(); URTWNHIST_CALLED();
 	ifp->if_timer = 0;
 	if (sc->tx_timer > 0) {
 		if (--sc->tx_timer == 0) {
 			aprint_error_dev(sc->sc_dev, "device timeout\n");
 			/* urtwn_init(ifp); XXX needs a process context! */
 			printf("ERROR2\n");
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			return;
+		}
 		ifp->if_timer = 1;
+	}
 	ieee80211_watchdog(&sc->sc_ic);
+}
 static int
 urtwn_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct urtwn_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	int s, error = 0;

 @@ -1,39 +1,39 @@
 /*	$OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $	*/
-/*	$NetBSD: if_zyd.c,v 1.55 2020/01/15 08:21:00 skrll Exp $	*/
+/*	$NetBSD: if_zyd.c,v 1.56 2020/01/29 06:39:07 thorpej Exp $	*/
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
  * Copyright (c) 2006 by Florian Stoehr <ich@florian-stoehr.de>
+ *
  * 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.
  */
 /*-
  * ZyDAS ZD1211/ZD1211B USB WLAN driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.55 2020/01/15 08:21:00 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.56 2020/01/29 06:39:07 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 @@ -1847,27 +1847,27 @@ zyd_intr(struct usbd_xfer *xfer, void *
 		 * retry statistics.  In BSS mode, this node is the AP we're
 		 * associated to so no lookup is actually needed.
 		 */
 		if (ic->ic_opmode != IEEE80211_M_STA) {
 			ni = ieee80211_find_node(&ic->ic_scan, retry->macaddr);
 			if (ni == NULL)
 				return;	/* just ignore */
 		} else
 			ni = ic->ic_bss;
 		((struct zyd_node *)ni)->amn.amn_retrycnt++;
 		if (le16toh(retry->count) & 0x100)
-			ifp->if_oerrors++;	/* too many retries */
+			if_statinc(ifp, if_oerrors);
 	} else if (le16toh(cmd->code) == ZYD_NOTIF_IORD) {
 		struct rq *rqp;
 		if (le16toh(*(uint16_t *)cmd->data) == ZYD_CR_INTERRUPT)
 			return;	/* HMAC interrupt */
 		usbd_get_xfer_status(xfer, NULL, NULL, &datalen, NULL);
 		datalen -= sizeof(cmd->code);
 		datalen -= 2;	/* XXX: padding? */
 		mutex_enter(&sc->sc_lock);
 		SIMPLEQ_FOREACH(rqp, &sc->sc_rqh, rq) {
 @@ -1903,60 +1903,60 @@ zyd_rx_data(struct zyd_softc *sc, const
+{
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = &sc->sc_if;
 	struct ieee80211_node *ni;
 	struct ieee80211_frame *wh;
 	const struct zyd_plcphdr *plcp;
 	const struct zyd_rx_stat *stat;
 	struct mbuf *m;
 	int rlen, s;
 	if (len < ZYD_MIN_FRAGSZ) {
 		printf("%s: frame too short (length=%d)\n",
 		    device_xname(sc->sc_dev), len);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	plcp = (const struct zyd_plcphdr *)buf;
 	stat = (const struct zyd_rx_stat *)
 	    (buf + len - sizeof(struct zyd_rx_stat));
 	if (stat->flags & ZYD_RX_ERROR) {
 		DPRINTF(("%s: RX status indicated error (%x)\n",
 		    device_xname(sc->sc_dev), stat->flags));
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	/* compute actual frame length */
 	rlen = len - sizeof(struct zyd_plcphdr) -
 	    sizeof(struct zyd_rx_stat) - IEEE80211_CRC_LEN;
 	/* allocate a mbuf to store the frame */
 	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		printf("%s: could not allocate rx mbuf\n",
 		    device_xname(sc->sc_dev));
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	if (rlen > MHLEN) {
 		MCLGET(m, M_DONTWAIT);
 		if (!(m->m_flags & M_EXT)) {
 			printf("%s: could not allocate rx mbuf cluster\n",
 			    device_xname(sc->sc_dev));
 			m_freem(m);
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			return;
+		}
+	}
 	m_set_rcvif(m, ifp);
 	m->m_pkthdr.len = m->m_len = rlen;
 	memcpy(mtod(m, uint8_t *), (const uint8_t *)(plcp + 1), rlen);
 	s = splnet();
 	if (sc->sc_drvbpf != NULL) {
 		struct zyd_rx_radiotap_header *tap = &sc->sc_rxtap;
 		static const uint8_t rates[] = {
 			/* reverse function of zyd_plcp_signal() */
 @@ -1996,27 +1996,27 @@ zyd_rxeof(struct usbd_xfer *xfer, void *
 		if (status == USBD_NOT_STARTED || status == USBD_CANCELLED)
 			return;
 		if (status == USBD_STALLED)
 			usbd_clear_endpoint_stall(sc->zyd_ep[ZYD_ENDPT_BIN]);
 		goto skip;
+	}
 	usbd_get_xfer_status(xfer, NULL, NULL, &len, NULL);
 	if (len < ZYD_MIN_RXBUFSZ) {
 		printf("%s: xfer too short (length=%d)\n",
 		    device_xname(sc->sc_dev), len);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		goto skip;
+	}
 	desc = (const struct zyd_rx_desc *)
 	    (data->buf + len - sizeof(struct zyd_rx_desc));
 	if (UGETW(desc->tag) == ZYD_TAG_MULTIFRAME) {
 		const uint8_t *p = data->buf, *end = p + len;
 		int i;
 		DPRINTFN(3, ("received multi-frame transfer\n"));
 		for (i = 0; i < ZYD_MAX_RXFRAMECNT; i++) {
 @@ -2135,67 +2135,67 @@ zyd_tx_mgt(struct zyd_softc *sc, struct
 	m_copydata(m0, 0, m0->m_pkthdr.len,
 	    data->buf + sizeof(struct zyd_tx_desc));
 	DPRINTFN(10, ("%s: sending mgt frame len=%zu rate=%u xferlen=%u\n",
 	    device_xname(sc->sc_dev), (size_t)m0->m_pkthdr.len, rate, xferlen));
 	m_freem(m0);	/* mbuf no longer needed */
 	usbd_setup_xfer(data->xfer, data, data->buf, xferlen,
 	    USBD_FORCE_SHORT_XFER, ZYD_TX_TIMEOUT, zyd_txeof);
 	error = usbd_transfer(data->xfer);
 	if (error != USBD_IN_PROGRESS && error != 0) {
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		return EIO;
+	}
 	sc->tx_queued++;
 	return 0;
+}
 Static void
 zyd_txeof(struct usbd_xfer *xfer, void * priv, usbd_status status)
+{
 	struct zyd_tx_data *data = priv;
 	struct zyd_softc *sc = data->sc;
 	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->zyd_ep[ZYD_ENDPT_BOUT]);
+		}
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		return;
+	}
 	s = splnet();
 	/* update rate control statistics */
 	((struct zyd_node *)data->ni)->amn.amn_txcnt++;
 	ieee80211_free_node(data->ni);
 	data->ni = NULL;
 	sc->tx_queued--;
-	ifp->if_opackets++;
+	if_statinc(ifp, if_opackets);
 	sc->tx_timer = 0;
 	ifp->if_flags &= ~IFF_OACTIVE;
 	zyd_start(ifp);
 	splx(s);
+}
 Static int
 zyd_tx_data(struct zyd_softc *sc, struct mbuf *m0, struct ieee80211_node *ni)
+{
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = &sc->sc_if;
 @@ -2292,27 +2292,27 @@ zyd_tx_data(struct zyd_softc *sc, struct
 	m_copydata(m0, 0, m0->m_pkthdr.len,
 	    data->buf + sizeof(struct zyd_tx_desc));
 	DPRINTFN(10, ("%s: sending data frame len=%zu rate=%u xferlen=%u\n",
 	    device_xname(sc->sc_dev), (size_t)m0->m_pkthdr.len, rate, xferlen));
 	m_freem(m0);	/* mbuf no longer needed */
 	usbd_setup_xfer(data->xfer, data, data->buf, xferlen,
 	    USBD_FORCE_SHORT_XFER, ZYD_TX_TIMEOUT, zyd_txeof);
 	error = usbd_transfer(data->xfer);
 	if (error != USBD_IN_PROGRESS && error != 0) {
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		return EIO;
+	}
 	sc->tx_queued++;
 	return 0;
+}
 Static void
 zyd_start(struct ifnet *ifp)
+{
 	struct zyd_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ether_header *eh;
 @@ -2348,55 +2348,55 @@ zyd_start(struct ifnet *ifp)
 			if (m0->m_len < sizeof(struct ether_header) &&
 			    !(m0 = m_pullup(m0, sizeof(struct ether_header))))
 				continue;
 			eh = mtod(m0, struct ether_header *);
 			ni = ieee80211_find_txnode(ic, eh->ether_dhost);
 			if (ni == NULL) {
 				m_freem(m0);
 				continue;
+			}
 			bpf_mtap(ifp, m0, BPF_D_OUT);
 			if ((m0 = ieee80211_encap(ic, m0, ni)) == NULL) {
 				ieee80211_free_node(ni);
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				continue;
+			}
 			bpf_mtap3(ic->ic_rawbpf, m0, BPF_D_OUT);
 			if (zyd_tx_data(sc, m0, ni) != 0) {
 				ieee80211_free_node(ni);
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				break;
+			}
+		}
 		sc->tx_timer = 5;
 		ifp->if_timer = 1;
+	}
+}
 Static void
 zyd_watchdog(struct ifnet *ifp)
+{
 	struct zyd_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	ifp->if_timer = 0;
 	if (sc->tx_timer > 0) {
 		if (--sc->tx_timer == 0) {
 			printf("%s: device timeout\n", device_xname(sc->sc_dev));
 			/* zyd_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
 zyd_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct zyd_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uhso.c,v 1.31 2019/12/01 08:27:54 maxv Exp $	*/
+/*	$NetBSD: uhso.c,v 1.32 2020/01/29 06:39:07 thorpej Exp $	*/
 /*-
  * Copyright (c) 2009 Iain Hibbert
  * Copyright (c) 2008 Fredrik Lindberg
  * 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
 @@ -27,27 +27,27 @@
  */
 /*
  *   This driver originated as the hso module for FreeBSD written by
  * Fredrik Lindberg[1]. It has been rewritten almost completely for
  * NetBSD, and to support more devices with information extracted from
  * the Linux hso driver provided by Option N.V.[2]
+ *
  *   [1] http://www.shapeshifter.se/code/hso
  *   [2] http://www.pharscape.org/hso.htm
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.31 2019/12/01 08:27:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.32 2020/01/29 06:39:07 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 @@ -2014,35 +2014,35 @@ uhso_ifnet_write_cb(struct usbd_xfer *xf
 		usb_detach_wakeupold(sc->sc_dev);
 	if (!ISSET(ifp->if_flags, IFF_RUNNING))
 		return;
 	if (status != USBD_NORMAL_COMPLETION) {
 		DPRINTF(0, "non-normal status %s\n", usbd_errstr(status));
 		if (status == USBD_STALLED && hp->hp_wpipe != NULL)
 			usbd_clear_endpoint_stall_async(hp->hp_wpipe);
 		else
 			return;
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 	} else {
 		usbd_get_xfer_status(xfer, NULL, NULL, &cc, NULL);
 		DPRINTF(5, "wrote %d bytes (of %zd)\n", cc, hp->hp_wlen);
 		if (cc != hp->hp_wlen)
 			DPRINTF(0, "cc=%u, wlen=%zd\n", cc, hp->hp_wlen);
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
+	}
 	s = splnet();
 	CLR(ifp->if_flags, IFF_OACTIVE);
 	ifp->if_start(ifp);
 	splx(s);
+}
 Static void
 uhso_ifnet_read_cb(struct usbd_xfer *xfer, void * p,
     usbd_status status)
+{
 	struct uhso_port *hp = p;
 @@ -2055,27 +2055,27 @@ uhso_ifnet_read_cb(struct usbd_xfer *xfe
 		usb_detach_wakeupold(sc->sc_dev);
 	if (!ISSET(ifp->if_flags, IFF_RUNNING))
 		return;
 	if (status != USBD_NORMAL_COMPLETION) {
 		DPRINTF(0, "non-normal status: %s\n", usbd_errstr(status));
 		if (status == USBD_STALLED && hp->hp_rpipe != NULL)
 			usbd_clear_endpoint_stall_async(hp->hp_rpipe);
 		else
 			return;
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		hp->hp_rlen = 0;
 	} else {
 		usbd_get_xfer_status(xfer, NULL, (void **)&cp, &cc, NULL);
 		hp->hp_rlen = cc;
 		DPRINTF(5, "read %d bytes\n", cc);
 		uhso_ifnet_input(ifp, &hp->hp_mbuf, cp, cc);
+	}
 	(*hp->hp_read)(hp);
+}
 @@ -2087,57 +2087,57 @@ uhso_ifnet_input(struct ifnet *ifp, stru
 	int s;
 	/*
 	 * Several IP packets might be in the same buffer, we need to
 	 * separate them before handing it to the ip-stack.  We might
 	 * also receive partial packets which we need to defer until
 	 * we get more data.
 	 */
 	while (cc > 0) {
 		if (*mb == NULL) {
 			MGETHDR(m, M_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				aprint_error_ifnet(ifp, "no mbufs\n");
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				break;
+			}
 			MCLGET(m, M_DONTWAIT);
 			if (!ISSET(m->m_flags, M_EXT)) {
 				aprint_error_ifnet(ifp, "no mbuf clusters\n");
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				m_freem(m);
 				break;
+			}
 			got = 0;
 		} else {
 			m = *mb;
 			*mb = NULL;
 			got = m->m_pkthdr.len;
+		}
 		/* make sure that the incoming packet is ok */
 		if (got == 0)
 			mtod(m, uint8_t *)[0] = cp[0];
 		want = mtod(m, struct ip *)->ip_hl << 2;
 		if (mtod(m, struct ip *)->ip_v != 4
 		    || want != sizeof(struct ip)) {
 			aprint_error_ifnet(ifp,
 			    "bad IP header (v=%d, hl=%zd)\n",
 			    mtod(m, struct ip *)->ip_v, want);
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			m_freem(m);
 			break;
+		}
 		/* ensure we have the IP header.. */
 		if (got < want) {
 			len = MIN(want - got, cc);
 			memcpy(mtod(m, uint8_t *) + got, cp, len);
 			got += len;
 			cc -= len;
 			cp += len;
 			if (got < want) {
 @@ -2169,28 +2169,27 @@ uhso_ifnet_input(struct ifnet *ifp, stru
+			}
+		}
 		m_set_rcvif(m, ifp);
 		m->m_pkthdr.len = m->m_len = got;
 		s = splnet();
 		bpf_mtap(ifp, m, BPF_D_IN);
 		if (__predict_false(!pktq_enqueue(ip_pktq, m, 0))) {
 			m_freem(m);
 		} else {
-			ifp->if_ipackets++;
+			if_statadd2(ifp, if_ipackets, 1, if_ibytes, got);
 			ifp->if_ibytes += got;
+		}
 		splx(s);
+	}
+}
 Static int
 uhso_ifnet_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct uhso_port *hp = ifp->if_softc;
 	int error, s;
 	s = splnet();
 @@ -2329,27 +2328,27 @@ uhso_ifnet_start(struct ifnet *ifp)
 		aprint_error_ifnet(ifp,
 		    "packet too long (%zd > %zd), truncating\n",
 		    hp->hp_wlen, hp->hp_wsize);
 		hp->hp_wlen = hp->hp_wsize;
+	}
 	bpf_mtap(ifp, m, BPF_D_OUT);
 	m_copydata(m, 0, hp->hp_wlen, hp->hp_wbuf);
 	m_freem(m);
 	if ((*hp->hp_write)(hp) != 0) {
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		CLR(ifp->if_flags, IFF_OACTIVE);
+	}
+}
 Static int
 uhso_ifnet_output(struct ifnet *ifp, struct mbuf *m,
     const struct sockaddr *dst, const struct rtentry *rt0)
+{
 	int error;
 	if (!ISSET(ifp->if_flags, IFF_RUNNING))
 		return EIO;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbnet.c,v 1.33 2019/12/14 15:40:43 maya Exp $	*/
+/*	$NetBSD: usbnet.c,v 1.34 2020/01/29 06:39:07 thorpej Exp $	*/
 /*
  * Copyright (c) 2019 Matthew R. Green
  * 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.
 @@ -23,27 +23,27 @@
  * 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.
  */
 /*
  * Common code shared between USB network drivers.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.33 2019/12/14 15:40:43 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.34 2020/01/29 06:39:07 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/atomic.h>
 #include <dev/usb/usbnet.h>
 #include <dev/usb/usbhist.h>
 struct usbnet_cdata {
 	struct usbnet_chain	*uncd_tx_chain;
 	struct usbnet_chain	*uncd_rx_chain;
 @@ -261,27 +261,27 @@ usbnet_enqueue(struct usbnet * const un,
 	USBNETHIST_FUNC();
 	struct ifnet * const ifp = usbnet_ifp(un);
 	struct usbnet_private * const unp __unused = un->un_pri;
 	struct mbuf *m;
 	USBNETHIST_CALLARGSN(5, "%d: enter: len=%zu csf %x mbf %x",
 	    unp->unp_number, buflen, csum_flags, mbuf_flags);
 	usbnet_isowned_rx(un);
 	m = usbnet_newbuf(buflen);
 	if (m == NULL) {
 		DPRINTF("%d: no memory", unp->unp_number, 0, 0, 0);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	m_set_rcvif(m, ifp);
 	m->m_pkthdr.csum_flags = csum_flags;
 	m->m_pkthdr.csum_data = csum_data;
 	m->m_flags |= mbuf_flags;
 	memcpy(mtod(m, uint8_t *), buf, buflen);
 	/* push the packet up */
 	if_percpuq_enqueue(ifp->if_percpuq, m);
+}
 @@ -290,27 +290,27 @@ usbnet_input(struct usbnet * const un, u
+{
 	USBNETHIST_FUNC();
 	struct ifnet * const ifp = usbnet_ifp(un);
 	struct usbnet_private * const unp __unused = un->un_pri;
 	struct mbuf *m;
 	USBNETHIST_CALLARGSN(5, "%d: enter: buf %jx len %ju",
 	    unp->unp_number, (uintptr_t)buf, buflen, 0);
 	usbnet_isowned_rx(un);
 	m = usbnet_newbuf(buflen);
 	if (m == NULL) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	m_set_rcvif(m, ifp);
 	memcpy(mtod(m, char *), buf, buflen);
 	/* push the packet up */
 	if_input(ifp, m);
+}
 /*
  * A frame has been uploaded: pass the resulting mbuf chain up to
  * the higher level protocols.
 @@ -392,32 +392,32 @@ usbnet_txeof(struct usbd_xfer *xfer, voi
+	}
 	KASSERT(cd->uncd_tx_cnt > 0);
 	cd->uncd_tx_cnt--;
 	unp->unp_timer = 0;
 	switch (status) {
 	case USBD_NOT_STARTED:
 	case USBD_CANCELLED:
 		break;
 	case USBD_NORMAL_COMPLETION:
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
 		break;
 	default:
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		if (usbd_ratecheck(&unp->unp_tx_notice))
 			aprint_error_dev(un->un_dev, "usb error on tx: %s\n",
 			    usbd_errstr(status));
 		if (status == USBD_STALLED)
 			usbd_clear_endpoint_stall_async(unp->unp_ep[USBNET_ENDPT_TX]);
 		break;
+	}
 	mutex_exit(&unp->unp_txlock);
 	if (status == USBD_NORMAL_COMPLETION && !IFQ_IS_EMPTY(&ifp->if_snd))
 		(*ifp->if_start)(ifp);
+}
 @@ -490,45 +490,45 @@ usbnet_start_locked(struct ifnet *ifp)
 	while (cd->uncd_tx_cnt < un->un_tx_list_cnt) {
 		IFQ_POLL(&ifp->if_snd, m);
 		if (m == NULL) {
 			DPRINTF("start called, queue empty", 0, 0, 0, 0);
 			break;
+		}
 		KASSERT(m->m_pkthdr.len <= un->un_tx_bufsz);
 		struct usbnet_chain *c = &cd->uncd_tx_chain[idx];
 		length = uno_tx_prepare(un, m, c);
 		if (length == 0) {
 			DPRINTF("uno_tx_prepare gave zero length", 0, 0, 0, 0);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			break;
+		}
 		if (__predict_false(c->unc_xfer == NULL)) {
 			DPRINTF("unc_xfer is NULL", 0, 0, 0, 0);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			break;
+		}
 		usbd_setup_xfer(c->unc_xfer, c, c->unc_buf, length,
 		    un->un_tx_xfer_flags, 10000, usbnet_txeof);
 		/* Transmit */
 		usbd_status err = usbd_transfer(c->unc_xfer);
 		if (err != USBD_IN_PROGRESS) {
 			DPRINTF("usbd_transfer on %jx for %ju bytes: %d",
 			    (uintptr_t)c->unc_buf, length, err, 0);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			break;
+		}
 		done_transmit = true;
 		IFQ_DEQUEUE(&ifp->if_snd, m);
 		/*
 		 * If there's a BPF listener, bounce a copy of this frame
 		 * to him.
 		 */
 		bpf_mtap(ifp, m, BPF_D_OUT);
 		m_freem(m);
 @@ -1139,27 +1139,27 @@ usbnet_tick(void *arg)
 		usb_add_task(un->un_udev, &unp->unp_ticktask, USB_TASKQ_DRIVER);
+	}
+}
 static void
 usbnet_watchdog(struct ifnet *ifp)
+{
 	USBNETHIST_FUNC(); USBNETHIST_CALLED();
 	struct usbnet * const un = ifp->if_softc;
 	struct usbnet_private * const unp = un->un_pri;
 	struct usbnet_cdata * const cd = un_cdata(un);
 	usbd_status err;
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	aprint_error_dev(un->un_dev, "watchdog timeout\n");
 	if (cd->uncd_tx_cnt > 0) {
 		DPRINTF("uncd_tx_cnt=%u non zero, aborting pipe", 0, 0, 0, 0);
 		err = usbd_abort_pipe(unp->unp_ep[USBNET_ENDPT_TX]);
 		if (err)
 			aprint_error_dev(un->un_dev, "pipe abort failed: %s\n",
 			    usbd_errstr(err));
 		if (cd->uncd_tx_cnt != 0)
 			DPRINTF("uncd_tx_cnt now %u", cd->uncd_tx_cnt, 0, 0, 0);
+	}
 	if (!IFQ_IS_EMPTY(&ifp->if_snd))