 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ipw.c,v 1.72 2019/02/03 03:19:27 mrg Exp $	*/
+/*	$NetBSD: if_ipw.c,v 1.73 2020/01/30 06:03:34 thorpej Exp $	*/
 /*	FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.15 2005/11/13 17:17:40 damien Exp 	*/
 /*-
  * Copyright (c) 2004, 2005
  *      Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice unmodified, this list of conditions, and the following
  *    disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -19,27 +19,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.72 2019/02/03 03:19:27 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.73 2020/01/30 06:03:34 thorpej Exp $");
 /*-
  * Intel(R) PRO/Wireless 2100 MiniPCI driver
  * http://www.intel.com/network/connectivity/products/wireless/prowireless_mobile.htm
  */
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 @@ -1025,59 +1025,59 @@ ipw_data_intr(struct ipw_softc *sc, stru
 	if (le32toh(status->len) < sizeof (struct ieee80211_frame_min) ||
 	    le32toh(status->len) > MCLBYTES)
 		return;
 	/*
 	 * Try to allocate a new mbuf for this ring element and load it before
 	 * processing the current mbuf. If the ring element cannot be loaded,
 	 * drop the received packet and reuse the old mbuf. In the unlikely
 	 * case that the old mbuf can't be reloaded either, explicitly panic.
 	 */
 	MGETHDR(mnew, M_DONTWAIT, MT_DATA);
 	if (mnew == NULL) {
 		aprint_error_dev(sc->sc_dev, "could not allocate rx mbuf\n");
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	MCLGET(mnew, M_DONTWAIT);
 	if (!(mnew->m_flags & M_EXT)) {
 		aprint_error_dev(sc->sc_dev, "could not allocate rx mbuf cluster\n");
 		m_freem(mnew);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	mnew->m_pkthdr.len = mnew->m_len = mnew->m_ext.ext_size;
 	bus_dmamap_sync(sc->sc_dmat, sbuf->map, 0, le32toh(status->len),
 	    BUS_DMASYNC_POSTREAD);
 	bus_dmamap_unload(sc->sc_dmat, sbuf->map);
 	error = bus_dmamap_load_mbuf(sc->sc_dmat, sbuf->map, mnew,
 	    BUS_DMA_READ | BUS_DMA_NOWAIT);
 	if (error != 0) {
 		aprint_error_dev(sc->sc_dev, "could not load rx buf DMA map\n");
 		m_freem(mnew);
 		/* try to reload the old mbuf */
 		error = bus_dmamap_load_mbuf(sc->sc_dmat, sbuf->map,
 		    sbuf->m, BUS_DMA_READ | BUS_DMA_NOWAIT);
 		if (error != 0) {
 			/* very unlikely that it will fail... */
 			panic("%s: unable to remap rx buf",
 			    device_xname(sc->sc_dev));
+		}
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	/*
 	 * New mbuf successfully loaded, update Rx ring and continue
 	 * processing.
 	 */
 	m = sbuf->m;
 	sbuf->m = mnew;
 	sbd->bd->physaddr = htole32(sbuf->map->dm_segs[0].ds_addr);
 	/* finalize mbuf */
 	m_set_rcvif(m, ifp);
 @@ -1227,27 +1227,27 @@ ipw_tx_intr(struct ipw_softc *sc)
 	int s;
 	if (!(sc->flags & IPW_FLAG_FW_INITED))
 		return;
 	s = splnet();
 	r = CSR_READ_4(sc, IPW_CSR_TX_READ);
 	for (i = (sc->txold + 1) % IPW_NTBD; i != r; i = (i + 1) % IPW_NTBD) {
 		sbd = &sc->stbd_list[i];
 		if (sbd->type == IPW_SBD_TYPE_DATA)
-			ifp->if_opackets++;
+			if_statinc(ifp, if_opackets);
 		ipw_release_sbd(sc, sbd);
 		sc->txfree++;
+	}
 	/* remember what the firmware has processed */
 	sc->txold = (r == 0) ? IPW_NTBD - 1 : r - 1;
 	/* Call start() since some buffer descriptors have been released */
 	ifp->if_flags &= ~IFF_OACTIVE;
 	ipw_start(ifp); /* in softint */
 	splx(s);
 @@ -1549,47 +1549,47 @@ ipw_start(struct ifnet *ifp)
 		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 (ipw_tx_start(ifp, m0, ni) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			break;
+		}
 		/* start watchdog timer */
 		sc->sc_tx_timer = 5;
 		ifp->if_timer = 1;
+	}
+}
 static void
 ipw_watchdog(struct ifnet *ifp)
+{
 	struct ipw_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");
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			ifp->if_flags &= ~IFF_UP;
 			ipw_stop(ifp, 1);
 			return;
+		}
 		ifp->if_timer = 1;
+	}
 	ieee80211_watchdog(&sc->sc_ic);
+}
 static int
 ipw_get_table1(struct ipw_softc *sc, uint32_t *tbl)
+{

 @@ -1,35 +1,35 @@
-/*	$NetBSD: if_iwi.c,v 1.112 2019/11/10 21:16:36 chs Exp $  */
+/*	$NetBSD: if_iwi.c,v 1.113 2020/01/30 06:03:34 thorpej Exp $  */
 /*	$OpenBSD: if_iwi.c,v 1.111 2010/11/15 19:11:57 damien Exp $	*/
 /*-
  * Copyright (c) 2004-2008
  *      Damien Bergamini <damien.bergamini@free.fr>. 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_iwi.c,v 1.112 2019/11/10 21:16:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.113 2020/01/30 06:03:34 thorpej Exp $");
 /*-
  * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
  * http://www.intel.com/network/connectivity/products/wireless/prowireless_mobile.htm
  */
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 @@ -1146,54 +1146,54 @@ iwi_frame_intr(struct iwi_softc *sc, str
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = ic->ic_ifp;
 	struct mbuf *m, *m_new;
 	struct ieee80211_frame *wh;
 	struct ieee80211_node *ni;
 	int error, s;
 	DPRINTFN(5, ("received frame len=%u chan=%u rssi=%u\n",
 	    le16toh(frame->len), frame->chan, frame->rssi_dbm));
 	if (le16toh(frame->len) < sizeof (struct ieee80211_frame) ||
 	    le16toh(frame->len) > MCLBYTES) {
 		DPRINTF(("%s: bad frame length\n", device_xname(sc->sc_dev)));
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	/*
 	 * Try to allocate a new mbuf for this ring element and
 	 * load it before processing the current mbuf. If the ring
 	 * element cannot be reloaded, drop the received packet
 	 * and reuse the old mbuf. In the unlikely case that
 	 * the old mbuf can't be reloaded either, explicitly panic.
+	 *
 	 * XXX Reorganize buffer by moving elements from the logical
 	 * end of the ring to the front instead of dropping.
 	 */
 	if ((m_new = iwi_alloc_rx_buf(sc)) == NULL) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	bus_dmamap_unload(sc->sc_dmat, data->map);
 	error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map, m_new,
 	    BUS_DMA_READ | BUS_DMA_NOWAIT);
 	if (error != 0) {
 		aprint_error_dev(sc->sc_dev,
 		    "could not load rx buf DMA map\n");
 		m_freem(m_new);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		error = bus_dmamap_load_mbuf(sc->sc_dmat, data->map,
 		    data->m, BUS_DMA_READ | BUS_DMA_NOWAIT);
 		if (error)
 			panic("%s: unable to remap rx buf",
 			    device_xname(sc->sc_dev));
 		return;
+	}
 	/*
 	 * New mbuf successfully loaded, update RX ring and continue
 	 * processing.
 	 */
 	m = data->m;
 @@ -1445,27 +1445,27 @@ iwi_tx_intr(struct iwi_softc *sc, struct
 	for (; txq->next != hw;) {
 		data = &txq->data[txq->next];
 		bus_dmamap_sync(sc->sc_dmat, data->map, 0,
 		    data->map->dm_mapsize, BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->sc_dmat, data->map);
 		m_freem(data->m);
 		data->m = NULL;
 		ieee80211_free_node(data->ni);
 		data->ni = NULL;
 		DPRINTFN(15, ("tx done idx=%u\n", txq->next));
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
 		txq->queued--;
 		txq->next = (txq->next + 1) % txq->count;
+	}
 	sc->sc_tx_timer = 0;
 	if (txq->queued < txq->count - 8 - 8 && (ifp->if_flags & IFF_OACTIVE)) {
 		ifp->if_flags &= ~IFF_OACTIVE;
 		/* Call start() since some buffer descriptors have been released */
 		iwi_start(ifp); /* in softint */
+	}
 @@ -1619,27 +1619,27 @@ iwi_tx_start(struct ifnet *ifp, struct m
 	} else
 		hdrlen = sizeof (struct ieee80211_frame);
 	/*
 	 * This is only used in IBSS mode where the firmware expect an index
 	 * in a h/w table instead of a destination address.
 	 */
 	if (ic->ic_opmode == IEEE80211_M_IBSS && in->in_station == -1) {
 		in->in_station = iwi_alloc_unr(sc);
 		if (in->in_station == -1) {	/* h/w table is full */
 			m_freem(m0);
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			return 0;
+		}
 		iwi_write_ibssnode(sc, in);
+	}
 	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
 		k = ieee80211_crypto_encap(ic, ni, m0);
 		if (k == NULL) {
 			m_freem(m0);
 			return ENOBUFS;
+		}
 		/* packet header may have moved, reset our local pointer */
 @@ -1772,93 +1772,93 @@ iwi_start(struct ifnet *ifp)
 	struct ieee80211_node *ni;
 	int ac;
 	if (ic->ic_state != IEEE80211_S_RUN)
 		return;
 	for (;;) {
 		IFQ_DEQUEUE(&ifp->if_snd, m0);
 		if (m0 == NULL)
 			break;
 		if (m0->m_len < sizeof (struct ether_header) &&
 		    (m0 = m_pullup(m0, sizeof (struct ether_header))) == NULL) {
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
 		eh = mtod(m0, struct ether_header *);
 		ni = ieee80211_find_txnode(ic, eh->ether_dhost);
 		if (ni == NULL) {
 			m_freem(m0);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
 		/* classify mbuf so we can find which tx ring to use */
 		if (ieee80211_classify(ic, m0, ni) != 0) {
 			m_freem(m0);
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
 		/* no QoS encapsulation for EAPOL frames */
 		ac = (eh->ether_type != htons(ETHERTYPE_PAE)) ?
 		    M_WME_GETAC(m0) : WME_AC_BE;
 		if (sc->txq[ac].queued > sc->txq[ac].count - 8) {
 			/* there is no place left in this ring */
 			IFQ_LOCK(&ifp->if_snd);
 			IF_PREPEND(&ifp->if_snd, m0);
 			IFQ_UNLOCK(&ifp->if_snd);
 			ifp->if_flags |= IFF_OACTIVE;
 			break;
+		}
 		bpf_mtap(ifp, m0, BPF_D_OUT);
 		m0 = ieee80211_encap(ic, m0, ni);
 		if (m0 == NULL) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
 		bpf_mtap3(ic->ic_rawbpf, m0, BPF_D_OUT);
 		if (iwi_tx_start(ifp, m0, ni, ac) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			break;
+		}
 		/* start watchdog timer */
 		sc->sc_tx_timer = 5;
 		ifp->if_timer = 1;
+	}
+}
 static void
 iwi_watchdog(struct ifnet *ifp)
+{
 	struct iwi_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");
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			ifp->if_flags &= ~IFF_UP;
 			iwi_stop(ifp, 1);
 			return;
+		}
 		ifp->if_timer = 1;
+	}
 	ieee80211_watchdog(&sc->sc_ic);
+}
 static int
 iwi_get_table0(struct iwi_softc *sc, uint32_t *tbl)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_iwm.c,v 1.83 2018/06/26 06:48:01 msaitoh Exp $	*/
+/*	$NetBSD: if_iwm.c,v 1.84 2020/01/30 06:03:34 thorpej Exp $	*/
 /*	OpenBSD: if_iwm.c,v 1.148 2016/11/19 21:07:08 stsp Exp	*/
 #define IEEE80211_NO_HT
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
  *   Author: Stefan Sperling <stsp@openbsd.org>
  * Copyright (c) 2014 Fixup Software Ltd.
+ *
  * 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
 @@ -96,27 +96,27 @@
  * 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_iwm.c,v 1.83 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.84 2020/01/30 06:03:34 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 @@ -4021,29 +4021,29 @@ iwm_rx_tx_cmd_single(struct iwm_softc *s
 	int status = le16toh(tx_resp->status.status) & IWM_TX_STATUS_MSK;
 	int failack = tx_resp->failure_frame;
 	KASSERT(tx_resp->frame_count == 1);
 	/* Update rate control statistics. */
 	in->in_amn.amn_txcnt++;
 	if (failack > 0) {
 		in->in_amn.amn_retrycnt++;
+	}
 	if (status != IWM_TX_STATUS_SUCCESS &&
 	    status != IWM_TX_STATUS_DIRECT_DONE)
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 	else
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
+}
 static void
 iwm_rx_tx_cmd(struct iwm_softc *sc, struct iwm_rx_packet *pkt,
     struct iwm_rx_data *data)
+{
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = IC2IFP(ic);
 	struct iwm_cmd_header *cmd_hdr = &pkt->hdr;
 	int idx = cmd_hdr->idx;
 	int qid = cmd_hdr->qid;
 	struct iwm_tx_ring *ring = &sc->txq[qid];
 	struct iwm_tx_data *txd = &ring->data[idx];
 @@ -6814,64 +6814,64 @@ iwm_start(struct ifnet *ifp)
 			ac = WME_AC_BE;
 			goto sendit;
+		}
 		if (ic->ic_state != IEEE80211_S_RUN) {
 			break;
+		}
 		IFQ_DEQUEUE(&ifp->if_snd, m);
 		if (m == NULL)
 			break;
 		if (m->m_len < 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;
+		}
 		/* classify mbuf so we can find which tx ring to use */
 		if (ieee80211_classify(ic, m, ni) != 0) {
 			m_freem(m);
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
 		/* No QoS encapsulation for EAPOL frames. */
 		ac = (eh->ether_type != htons(ETHERTYPE_PAE)) ?
 		    M_WME_GETAC(m) : WME_AC_BE;
 		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 (iwm_tx(sc, m, ni, ac) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
 		if (ifp->if_flags & IFF_UP) {
 			sc->sc_tx_timer = 15;
 			ifp->if_timer = 1;
+		}
+	}
+}
 static void
 iwm_stop(struct ifnet *ifp, int disable)
+{
 @@ -6900,27 +6900,27 @@ static void
 iwm_watchdog(struct ifnet *ifp)
+{
 	struct iwm_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");
 #ifdef IWM_DEBUG
 			iwm_nic_error(sc);
 #endif
 			ifp->if_flags &= ~IFF_UP;
 			iwm_stop(ifp, 1);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			return;
+		}
 		ifp->if_timer = 1;
+	}
 	ieee80211_watchdog(&sc->sc_ic);
+}
 static int
 iwm_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct iwm_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;

 @@ -1,38 +1,38 @@
-/*	$NetBSD: if_iwn.c,v 1.92 2019/10/10 22:34:42 bad Exp $	*/
+/*	$NetBSD: if_iwn.c,v 1.93 2020/01/30 06:03:34 thorpej Exp $	*/
 /*	$OpenBSD: if_iwn.c,v 1.135 2014/09/10 07:22:09 dcoppa Exp $	*/
 /*-
  * Copyright (c) 2007-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.
  */
 /*
  * Driver for Intel WiFi Link 4965 and 1000/5000/6000 Series 802.11 network
  * adapters.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.92 2019/10/10 22:34:42 bad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.93 2020/01/30 06:03:34 thorpej Exp $");
 #define IWN_USE_RBUF	/* Use local storage for RX */
 #undef IWN_HWCRYPTO	/* XXX does not even compile yet */
 #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/malloc.h>
 #ifdef notyetMODULE
 @@ -2065,65 +2065,65 @@ iwn_rx_done(struct iwn_softc *sc, struct
 		struct iwn_rx_mpdu *mpdu = (struct iwn_rx_mpdu *)(desc + 1);
 		head = (char *)(mpdu + 1);
 		len = le16toh(mpdu->len);
 	} else {
 		head = (char *)(stat + 1) + stat->cfg_phy_len;
 		len = le16toh(stat->len);
+	}
 	flags = le32toh(*(uint32_t *)(head + len));
 	/* Discard frames with a bad FCS early. */
 	if ((flags & IWN_RX_NOERROR) != IWN_RX_NOERROR) {
 		DPRINTFN(2, ("RX flags error %x\n", flags));
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	/* Discard frames that are too short. */
 	if (len < sizeof (*wh)) {
 		DPRINTF(("frame too short: %d\n", len));
 		ic->ic_stats.is_rx_tooshort++;
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	m1 = MCLGETIalt(sc, M_DONTWAIT, NULL, IWN_RBUF_SIZE);
 	if (m1 == NULL) {
 		ic->ic_stats.is_rx_nobuf++;
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	bus_dmamap_unload(sc->sc_dmat, data->map);
 	error = bus_dmamap_load(sc->sc_dmat, data->map, mtod(m1, void *),
 	    IWN_RBUF_SIZE, NULL, BUS_DMA_NOWAIT | BUS_DMA_READ);
 	if (error != 0) {
 		m_freem(m1);
 		/* Try to reload the old mbuf. */
 		error = bus_dmamap_load(sc->sc_dmat, data->map,
 		    mtod(data->m, void *), IWN_RBUF_SIZE, NULL,
 		    BUS_DMA_NOWAIT | BUS_DMA_READ);
 		if (error != 0) {
 			panic("%s: could not load old RX mbuf",
 			    device_xname(sc->sc_dev));
+		}
 		/* Physical address may have changed. */
 		ring->desc[ring->cur] =
 		    htole32(data->map->dm_segs[0].ds_addr >> 8);
 		bus_dmamap_sync(sc->sc_dmat, ring->desc_dma.map,
 		    ring->cur * sizeof (uint32_t), sizeof (uint32_t),
 		    BUS_DMASYNC_PREWRITE);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	m = data->m;
 	data->m = m1;
 	/* Update RX descriptor. */
 	ring->desc[ring->cur] = htole32(data->map->dm_segs[0].ds_addr >> 8);
 	bus_dmamap_sync(sc->sc_dmat, ring->desc_dma.map,
 	    ring->cur * sizeof (uint32_t), sizeof (uint32_t),
 	    BUS_DMASYNC_PREWRITE);
 	/* Finalize mbuf. */
 	m_set_rcvif(m, ifp);
 @@ -2390,29 +2390,29 @@ iwn_tx_done(struct iwn_softc *sc, struct
 	struct iwn_tx_ring *ring = &sc->txq[desc->qid & 0xf];
 	struct iwn_tx_data *data = &ring->data[desc->idx];
 	struct iwn_node *wn = (struct iwn_node *)data->ni;
 	int s;
 	s = splnet();
 	/* Update rate control statistics. */
 	wn->amn.amn_txcnt++;
 	if (ackfailcnt > 0)
 		wn->amn.amn_retrycnt++;
 	if (status != 1 && status != 2)
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 	else
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
 	/* Unmap and free mbuf. */
 	bus_dmamap_sync(sc->sc_dmat, data->map, 0, data->map->dm_mapsize,
 	    BUS_DMASYNC_POSTWRITE);
 	bus_dmamap_unload(sc->sc_dmat, data->map);
 	m_freem(data->m);
 	data->m = NULL;
 	ieee80211_free_node(data->ni);
 	data->ni = NULL;
 	sc->sc_tx_timer = 0;
 	if (--ring->queued < IWN_TX_RING_LOMARK) {
 		sc->qfullmsk &= ~(1 << ring->qid);
 @@ -3202,90 +3202,90 @@ iwn_start(struct ifnet *ifp)
 			ni = M_GETCTX(m, struct ieee80211_node *);
 			ac = 0;
 			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 < 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;
+		}
 		/* classify mbuf so we can find which tx ring to use */
 		if (ieee80211_classify(ic, m, ni) != 0) {
 			m_freem(m);
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
 		/* No QoS encapsulation for EAPOL frames. */
 		ac = (eh->ether_type != htons(ETHERTYPE_PAE)) ?
 		    M_WME_GETAC(m) : WME_AC_BE;
 		if (sc->sc_beacon_wait == 0)
 			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:
 		if (sc->sc_beacon_wait)
 			continue;
 		bpf_mtap3(ic->ic_rawbpf, m, BPF_D_OUT);
 		if (iwn_tx(sc, m, ni, ac) != 0) {
 			ieee80211_free_node(ni);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			continue;
+		}
 		sc->sc_tx_timer = 5;
 		ifp->if_timer = 1;
+	}
 	if (sc->sc_beacon_wait > 1)
 		sc->sc_beacon_wait = 0;
+}
 static void
 iwn_watchdog(struct ifnet *ifp)
+{
 	struct iwn_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");
 			ifp->if_flags &= ~IFF_UP;
 			iwn_stop(ifp, 1);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			return;
+		}
 		ifp->if_timer = 1;
+	}
 	ieee80211_watchdog(&sc->sc_ic);
+}
 static int
 iwn_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct iwn_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;

 @@ -1,39 +1,39 @@
-/*	$NetBSD: if_rtwn.c,v 1.18 2018/12/09 11:14:02 jdolecek Exp $	*/
+/*	$NetBSD: if_rtwn.c,v 1.19 2020/01/30 06:03:34 thorpej Exp $	*/
 /*	$OpenBSD: if_rtwn.c,v 1.5 2015/06/14 08:02:47 stsp Exp $	*/
 #define	IEEE80211_NO_HT
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
  * Copyright (c) 2015 Stefan Sperling <stsp@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.
  */
 /*
  * Driver for Realtek RTL8188CE
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtwn.c,v 1.18 2018/12/09 11:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtwn.c,v 1.19 2020/01/30 06:03:34 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/callout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/mutex.h>
 @@ -1679,99 +1679,99 @@ rtwn_rx_frame(struct rtwn_softc *sc, str
 	int8_t rssi = 0;
 	int infosz, pktlen, shift, totlen, error, s;
 	DPRINTFN(3, ("%s: %s\n", device_xname(sc->sc_dev), __func__));
 	rxdw0 = le32toh(rx_desc->rxdw0);
 	rxdw3 = le32toh(rx_desc->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.
 		 */
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	pktlen = MS(rxdw0, R92C_RXDW0_PKTLEN);
         /*
 	 * XXX: This will drop most control packets.  Do we really
 	 * want this in IEEE80211_M_MONITOR mode?
 	 */
 	if (__predict_false(pktlen < (int)sizeof(struct ieee80211_frame_ack))) {
 		ic->ic_stats.is_rx_tooshort++;
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	if (__predict_false(pktlen > MCLBYTES)) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	rate = MS(rxdw3, R92C_RXDW3_RATE);
 	infosz = MS(rxdw0, R92C_RXDW0_INFOSZ) * 8;
 	if (infosz > sizeof(struct r92c_rx_phystat))
 		infosz = sizeof(struct r92c_rx_phystat);
 	shift = MS(rxdw0, R92C_RXDW0_SHIFT);
 	totlen = pktlen + infosz + shift;
 	/* Get RSSI from PHY status descriptor if present. */
 	if (infosz != 0 && (rxdw0 & R92C_RXDW0_PHYST)) {
 		phy = mtod(rx_data->m, struct r92c_rx_phystat *);
 		rssi = rtwn_get_rssi(sc, rate, phy);
 		/* Update our average RSSI. */
 		rtwn_update_avgrssi(sc, rate, rssi);
+	}
 	DPRINTFN(5, ("Rx frame len=%d rate=%d infosz=%d shift=%d rssi=%d\n",
 	    pktlen, rate, infosz, shift, rssi));
 	MGETHDR(m1, M_DONTWAIT, MT_DATA);
 	if (__predict_false(m1 == NULL)) {
 		ic->ic_stats.is_rx_nobuf++;
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	MCLGET(m1, M_DONTWAIT);
 	if (__predict_false(!(m1->m_flags & M_EXT))) {
 		m_freem(m1);
 		ic->ic_stats.is_rx_nobuf++;
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	bus_dmamap_sync(sc->sc_dmat, rx_data->map, 0, totlen,
 	    BUS_DMASYNC_POSTREAD);
 	bus_dmamap_unload(sc->sc_dmat, rx_data->map);
 	error = bus_dmamap_load(sc->sc_dmat, rx_data->map, mtod(m1, void *),
 	    MCLBYTES, NULL, BUS_DMA_NOWAIT | BUS_DMA_READ);
 	if (error != 0) {
 		m_freem(m1);
 		if (bus_dmamap_load_mbuf(sc->sc_dmat, rx_data->map,
 		    rx_data->m, BUS_DMA_NOWAIT))
 			panic("%s: could not load old RX mbuf",
 			    device_xname(sc->sc_dev));
 		bus_dmamap_sync(sc->sc_dmat, rx_data->map, 0, MCLBYTES,
 		    BUS_DMASYNC_PREREAD);
 		/* Physical address may have changed. */
 		rtwn_setup_rx_desc(sc, rx_desc,
 		    rx_data->map->dm_segs[0].ds_addr, MCLBYTES, desc_idx);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	/* Finalize mbuf. */
 	m = rx_data->m;
 	rx_data->m = m1;
 	m->m_pkthdr.len = m->m_len = totlen;
 	m_set_rcvif(m, ifp);
 	bus_dmamap_sync(sc->sc_dmat, rx_data->map, 0, MCLBYTES,
 	    BUS_DMASYNC_PREREAD);
 	/* Update RX descriptor. */
 @@ -2049,27 +2049,27 @@ rtwn_tx_done(struct rtwn_softc *sc, int
 		if (tx_data->m == NULL)
 			continue;
 		tx_desc = &tx_ring->desc[i];
 		if (le32toh(tx_desc->txdw0) & R92C_TXDW0_OWN)
 			continue;
 		bus_dmamap_unload(sc->sc_dmat, tx_data->map);
 		m_freem(tx_data->m);
 		tx_data->m = NULL;
 		ieee80211_free_node(tx_data->ni);
 		tx_data->ni = NULL;
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
 		sc->sc_tx_timer = 0;
 		tx_ring->queued--;
+	}
 	if (tx_ring->queued < RTWN_TX_LIST_LOMARK)
 		sc->qfullmsk &= ~(1 << qid);
 	splx(s);
+}
 static void
 rtwn_start(struct ifnet *ifp)
+{
 @@ -2096,75 +2096,75 @@ rtwn_start(struct ifnet *ifp)
 			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 (rtwn_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;
+	}
 	DPRINTFN(3, ("%s: %s done\n", device_xname(sc->sc_dev), __func__));
+}
 static void
 rtwn_watchdog(struct ifnet *ifp)
+{
 	struct rtwn_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	DPRINTFN(3, ("%s: %s\n", device_xname(sc->sc_dev), __func__));
 	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");
 			softint_schedule(sc->init_task);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			return;
+		}
 		ifp->if_timer = 1;
+	}
 	ieee80211_watchdog(ic);
+}
 static int
 rtwn_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct rtwn_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	int s, error = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_sk.c,v 1.103 2019/12/27 07:02:26 msaitoh Exp $	*/
+/*	$NetBSD: if_sk.c,v 1.104 2020/01/30 06:03:34 thorpej Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -105,27 +105,27 @@
  * interface with DMA support. Each card may have between 512K and
  * 2MB of SRAM on board depending on the configuration.
+ *
  * The SysKonnect GEnesis controller can have either one or two XMAC
  * chips connected to it, allowing single or dual port NIC configurations.
  * SysKonnect has the distinction of being the only vendor on the market
  * with a dual port gigabit ethernet NIC. The GEnesis provides dual FIFOs,
  * dual DMA queues, packet/MAC/transmit arbiters and direct access to the
  * XMAC registers. This driver takes advantage of these features to allow
  * both XMACs to operate as independent interfaces.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.103 2019/12/27 07:02:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.104 2020/01/30 06:03:34 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/callout.h>
 #include <sys/sysctl.h>
 @@ -2001,27 +2001,27 @@ sk_start(struct ifnet *ifp)
 static void
 sk_watchdog(struct ifnet *ifp)
+{
 	struct sk_if_softc *sc_if = ifp->if_softc;
 	/*
 	 * Reclaim first as there is a possibility of losing Tx completion
 	 * interrupts.
 	 */
 	sk_txeof(sc_if);
 	if (sc_if->sk_cdata.sk_tx_cnt != 0) {
 		aprint_error_dev(sc_if->sk_dev, "watchdog timeout\n");
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		sk_init(ifp);
+	}
+}
 #if 0 /* XXX XXX XXX UNUSED */
 static void
 sk_shutdown(void *v)
+{
 	struct sk_if_softc	*sc_if = (struct sk_if_softc *)v;
 	struct sk_softc		*sc = sc_if->sk_softc;
 	struct ifnet		*ifp = &sc_if->sk_ethercom.ec_if;
 @@ -2076,47 +2076,47 @@ sk_rxeof(struct sk_if_softc *sc_if)
 		bus_dmamap_sync(sc_if->sk_softc->sc_dmatag, dmamap, 0,
 		    dmamap->dm_mapsize, BUS_DMASYNC_POSTREAD);
 		rxstat = le32toh(cur_desc->sk_xmac_rxstat);
 		m = cur_rx->sk_mbuf;
 		cur_rx->sk_mbuf = NULL;
 		total_len = SK_RXBYTES(le32toh(cur_desc->sk_ctl));
 		sc_if->sk_cdata.sk_rx_map[cur] = 0;
 		SK_INC(i, SK_RX_RING_CNT);
 		if (rxstat & XM_RXSTAT_ERRFRAME) {
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			sk_newbuf(sc_if, cur, m, dmamap);
 			continue;
+		}
 		/*
 		 * Try to allocate a new jumbo buffer. If that
 		 * fails, copy the packet to mbufs and put the
 		 * jumbo buffer back in the ring so it can be
 		 * re-used. If allocating mbufs fails, then we
 		 * have to drop the packet.
 		 */
 		if (sk_newbuf(sc_if, cur, NULL, dmamap) == ENOBUFS) {
 			struct mbuf		*m0;
 			m0 = m_devget(mtod(m, char *) - ETHER_ALIGN,
 			    total_len + ETHER_ALIGN, 0, ifp);
 			sk_newbuf(sc_if, cur, m, dmamap);
 			if (m0 == NULL) {
 				aprint_error_dev(sc_if->sk_dev, "no receive "
 				    "buffers available -- packet dropped!\n");
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				continue;
+			}
 			m_adj(m0, ETHER_ALIGN);
 			m = m0;
 		} else {
 			m_set_rcvif(m, ifp);
 			m->m_pkthdr.len = m->m_len = total_len;
+		}
 		/* pass it on. */
 		if_percpuq_enqueue(ifp->if_percpuq, m);
+	}
+}
 @@ -2142,27 +2142,27 @@ sk_txeof(struct sk_if_softc *sc_if)
 		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 		cur_tx = &sc_if->sk_rdata->sk_tx_ring[idx];
 		sk_ctl = le32toh(cur_tx->sk_ctl);
 #ifdef SK_DEBUG
 		if (skdebug >= 3)
 			sk_dump_txdesc(cur_tx, idx);
 #endif
 		if (sk_ctl & SK_TXCTL_OWN) {
 			SK_CDTXSYNC(sc_if, idx, 1, BUS_DMASYNC_PREREAD);
 			break;
+		}
 		if (sk_ctl & SK_TXCTL_LASTFRAG)
-			ifp->if_opackets++;
+			if_statinc(ifp, if_opackets);
 		if (sc_if->sk_cdata.sk_tx_chain[idx].sk_mbuf != NULL) {
 			entry = sc_if->sk_cdata.sk_tx_map[idx];
 			m_freem(sc_if->sk_cdata.sk_tx_chain[idx].sk_mbuf);
 			sc_if->sk_cdata.sk_tx_chain[idx].sk_mbuf = NULL;
 			bus_dmamap_sync(sc->sc_dmatag, entry->dmamap, 0,
 			    entry->dmamap->dm_mapsize, BUS_DMASYNC_POSTWRITE);
 			bus_dmamap_unload(sc->sc_dmatag, entry->dmamap);
 			SIMPLEQ_INSERT_TAIL(&sc_if->sk_txmap_head, entry,
 					  link);
 			sc_if->sk_cdata.sk_tx_map[idx] = NULL;