	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: bwfm.c,v 1.19 2019/12/27 09:22:20 msaitoh Exp $ */	1	/* $NetBSD: bwfm.c,v 1.20 2020/01/29 14:14:55 thorpej Exp $ */
2	/* $OpenBSD: bwfm.c,v 1.5 2017/10/16 22:27:16 patrick Exp $ */	2	/* $OpenBSD: bwfm.c,v 1.5 2017/10/16 22:27:16 patrick Exp $ */
3	/*	3	/*
4	* Copyright (c) 2010-2016 Broadcom Corporation	4	* Copyright (c) 2010-2016 Broadcom Corporation
5	* Copyright (c) 2016,2017 Patrick Wildt <patrick@blueri.se>	5	* Copyright (c) 2016,2017 Patrick Wildt <patrick@blueri.se>
6	*	6	*
7	* Permission to use, copy, modify, and/or distribute this software for any	7	* Permission to use, copy, modify, and/or distribute this software for any
8	* purpose with or without fee is hereby granted, provided that the above	8	* purpose with or without fee is hereby granted, provided that the above
9	* copyright notice and this permission notice appear in all copies.	9	* copyright notice and this permission notice appear in all copies.
10	*	10	*
11	* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES	11	* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12	* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF	12	* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13	* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR	13	* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14	* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES	14	* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
	@@ -319,27 +319,27 @@ bwfm_start(struct ifnet *ifp)		@@ -319,27 +319,27 @@ bwfm_start(struct ifnet *ifp)
319	}	319	}
320		320
321	IFQ_DEQUEUE(&ifp->if_snd, m);	321	IFQ_DEQUEUE(&ifp->if_snd, m);
322	if (m == NULL)	322	if (m == NULL)
323	break;	323	break;
324		324
325	error = sc->sc_bus_ops->bs_txdata(sc, &m);	325	error = sc->sc_bus_ops->bs_txdata(sc, &m);
326	if (error == ENOBUFS) {	326	if (error == ENOBUFS) {
327	IF_PREPEND(&ifp->if_snd, m);	327	IF_PREPEND(&ifp->if_snd, m);
328	ifp->if_flags \|= IFF_OACTIVE;	328	ifp->if_flags \|= IFF_OACTIVE;
329	break;	329	break;
330	}	330	}
331	if (error != 0) {	331	if (error != 0) {
332	ifp->if_oerrors++;	332	if_statinc(ifp, if_oerrors);
333	m_freem(m);	333	m_freem(m);
334	continue;	334	continue;
335	}	335	}
336		336
337	bpf_mtap(ifp, m, BPF_D_OUT);	337	bpf_mtap(ifp, m, BPF_D_OUT);
338	}	338	}
339	}	339	}
340		340
341	int	341	int
342	bwfm_init(struct ifnet *ifp)	342	bwfm_init(struct ifnet *ifp)
343	{	343	{
344	struct bwfm_softc *sc = ifp->if_softc;	344	struct bwfm_softc *sc = ifp->if_softc;
345	struct ieee80211com *ic = &sc->sc_ic;	345	struct ieee80211com *ic = &sc->sc_ic;
	@@ -501,27 +501,27 @@ bwfm_stop(struct ifnet *ifp, int disable		@@ -501,27 +501,27 @@ bwfm_stop(struct ifnet *ifp, int disable
501	}	501	}
502		502
503	void	503	void
504	bwfm_watchdog(struct ifnet *ifp)	504	bwfm_watchdog(struct ifnet *ifp)
505	{	505	{
506	struct bwfm_softc *sc = ifp->if_softc;	506	struct bwfm_softc *sc = ifp->if_softc;
507	struct ieee80211com *ic = &sc->sc_ic;	507	struct ieee80211com *ic = &sc->sc_ic;
508		508
509	ifp->if_timer = 0;	509	ifp->if_timer = 0;
510		510
511	if (sc->sc_tx_timer > 0) {	511	if (sc->sc_tx_timer > 0) {
512	if (--sc->sc_tx_timer == 0) {	512	if (--sc->sc_tx_timer == 0) {
513	printf("%s: device timeout\n", DEVNAME(sc));	513	printf("%s: device timeout\n", DEVNAME(sc));
514	ifp->if_oerrors++;	514	if_statinc(ifp, if_oerrors);
515	return;	515	return;
516	}	516	}
517	ifp->if_timer = 1;	517	ifp->if_timer = 1;
518	}	518	}
519	ieee80211_watchdog(ic);	519	ieee80211_watchdog(ic);
520	}	520	}
521		521
522	int	522	int
523	bwfm_ioctl(struct ifnet ifp, u_long cmd, void data)	523	bwfm_ioctl(struct ifnet ifp, u_long cmd, void data)
524	{	524	{
525	struct bwfm_softc *sc = ifp->if_softc;	525	struct bwfm_softc *sc = ifp->if_softc;
526	struct ieee80211com *ic = &sc->sc_ic;	526	struct ieee80211com *ic = &sc->sc_ic;
527	int s, error = 0;	527	int s, error = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bwi.c,v 1.36 2018/12/22 14:07:53 maxv Exp $	*/
+/*	$NetBSD: bwi.c,v 1.37 2020/01/29 14:14:55 thorpej Exp $	*/
 /*	$OpenBSD: bwi.c,v 1.74 2008/02/25 21:13:30 mglocker Exp $	*/
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
+ *
  * This code is derived from software contributed to The DragonFly Project
  * by Sepherosa Ziehau <sepherosa@gmail.com>
+ *
  * 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
 @@ -38,27 +38,27 @@
  */
 /*
  * Broadcom AirForce BCM43xx IEEE 802.11b/g wireless network driver
  * Generic back end
  */
 /* [TRC: XXX Names beginning with `bwi_ieee80211_*' are those that I
    think should be in NetBSD's generic 802.11 code, not in this
    driver.] */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.36 2018/12/22 14:07:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.37 2020/01/29 14:14:55 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 @@ -7410,95 +7410,95 @@ bwi_start(struct ifnet *ifp)
 		} else {
 			struct ether_header *eh;
 			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));
 				if (m == 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) {
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				m_freem(m);
 				continue;
+			}
 			/* [TRC: XXX Superstitiously cargo-culted from
 			   ath(4) and wi(4).] */
 			if ((ni->ni_flags & IEEE80211_NODE_PWR_MGT) &&
 			    (m->m_flags & M_PWR_SAV) == 0) {
 				ieee80211_pwrsave(ic, ni, m);
 				ieee80211_free_node(ni);
 				continue;
+			}
 			/* [TRC: XXX I *think* we're supposed to do
 			   this, but honestly I have no clue.  We don't
 			   use M_WME_GETAC, so...] */
 			if (ieee80211_classify(ic, m, ni)) {
 				/* [TRC: XXX What debug flag?] */
 				DPRINTF(sc, BWI_DBG_MISC,
 				    "%s: discard, classification failure\n",
 				    __func__);
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				m_freem(m);
 				ieee80211_free_node(ni);
 				continue;
+			}
 			/* [TRC: XXX wi(4) and awi(4) do this; iwi(4)
 			   doesn't.] */
-			ifp->if_opackets++;
+			if_statinc(ifp, if_opackets);
 			/* [TRC: XXX When should the packet be
 			   filtered?  Different drivers appear to do it
 			   at different times.] */
 			/* TODO: PS */
 			bpf_mtap(ifp, m, BPF_D_OUT);
 			m = ieee80211_encap(ic, m, ni);
 			if (m == NULL) {
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				ieee80211_free_node(ni);
 				continue;
+			}
+		}
 		bpf_mtap3(ic->ic_rawbpf, m, BPF_D_OUT);
 		wh = mtod(m, struct ieee80211_frame *);
 		/* [TRC: XXX What about ic->ic_flags & IEEE80211_F_PRIVACY?] */
 		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
 			if (ieee80211_crypto_encap(ic, ni, m) == NULL) {
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				m_freem(m);
 				ieee80211_free_node(ni);
 				continue;
+			}
+		}
 		wh = NULL;	/* [TRC: XXX Huh?] */
 		if (bwi_encap(sc, idx, m, &ni, mgt_pkt) != 0) {
 			/* 'm' is freed in bwi_encap() if we reach here */
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			if (ni != NULL)
 				ieee80211_free_node(ni);
 			continue;
+		}
 		trans = 1;
 		tbd->tbd_used++;
 		idx = (idx + 1) % BWI_TX_NDESC;
 		if (tbd->tbd_used + BWI_TX_NSPRDESC >= BWI_TX_NDESC) {
 			ifp->if_flags |= IFF_OACTIVE;
 			break;
+		}
 @@ -7514,27 +7514,27 @@ static void
 bwi_watchdog(struct ifnet *ifp)
+{
 	struct bwi_softc *sc = ifp->if_softc;
 	ifp->if_timer = 0;
 	if ((ifp->if_flags & IFF_RUNNING) == 0 ||
 	    !device_is_active(sc->sc_dev))
 		return;
 	if (sc->sc_tx_timer) {
 		if (--sc->sc_tx_timer == 0) {
 			aprint_error_dev(sc->sc_dev, "device timeout\n");
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			/* TODO */
 			/* [TRC: XXX TODO what?  Stop the device?
 			   Bring it down?  iwi(4) does this.] */
 		} else
 			ifp->if_timer = 1;
+	}
 	ieee80211_watchdog(&sc->sc_ic);
+}
 static void
 bwi_stop(struct ifnet *ifp, int state_chg)
+{
 @@ -8465,43 +8465,43 @@ bwi_rxeof(struct bwi_softc *sc, int end_
 		struct bwi_rxbuf_hdr *hdr;
 		struct ieee80211_frame_min *wh;
 		struct ieee80211_node *ni;
 		struct mbuf *m;
 		const void *plcp;
 		uint16_t flags2;
 		int buflen, wh_ofs, hdr_extra, rssi, type, rate;
 		m = rb->rb_mbuf;
 		bus_dmamap_sync(sc->sc_dmat, rb->rb_dmap, 0,
 		    rb->rb_dmap->dm_mapsize, BUS_DMASYNC_POSTREAD);
 		if (bwi_newbuf(sc, idx, 0)) {
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			goto next;
+		}
 		hdr = mtod(m, struct bwi_rxbuf_hdr *);
 		flags2 = le16toh(hdr->rxh_flags2);
 		hdr_extra = 0;
 		if (flags2 & BWI_RXH_F2_TYPE2FRAME)
 			hdr_extra = 2;
 		wh_ofs = hdr_extra + 6; /* XXX magic number */
 		buflen = le16toh(hdr->rxh_buflen);
 		if (buflen < BWI_FRAME_MIN_LEN(wh_ofs)) {
 			aprint_error_dev(sc->sc_dev, "short frame %d,"
 			    " hdr_extra %d\n", buflen, hdr_extra);
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			m_freem(m);
 			goto next;
+		}
 		plcp = ((const uint8_t *)(hdr + 1) + hdr_extra);
 		rssi = bwi_calc_rssi(sc, hdr);
 		m_set_rcvif(m, ifp);
 		m->m_len = m->m_pkthdr.len = buflen + sizeof(*hdr);
 		m_adj(m, sizeof(*hdr) + wh_ofs);
 		if (htole16(hdr->rxh_flags1) & BWI_RXH_F1_OFDM)
 			rate = bwi_ofdm_plcp2rate(plcp);
 @@ -9385,27 +9385,27 @@ bwi_txeof(struct bwi_softc *sc)
 		tx_status0 = CSR_READ_4(sc, BWI_TXSTATUS_0);
 		if ((tx_status0 & BWI_TXSTATUS_0_MORE) == 0)
 			break;
 		(void)CSR_READ_4(sc, BWI_TXSTATUS_1);
 		tx_id = __SHIFTOUT(tx_status0, BWI_TXSTATUS_0_TXID_MASK);
 		tx_info = BWI_TXSTATUS_0_INFO(tx_status0);
 		if (tx_info & 0x30) /* XXX */
 			continue;
 		_bwi_txeof(sc, tx_id);
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
+	}
 	if ((ifp->if_flags & IFF_OACTIVE) == 0)
 		ifp->if_start(ifp);
 	splx(s);
+}
 static int
 bwi_bbp_power_on(struct bwi_softc *sc, enum bwi_clock_mode clk_mode)
+{
 	bwi_power_on(sc, 1);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cs89x0.c,v 1.47 2019/05/29 10:07:29 msaitoh Exp $	*/
+/*	$NetBSD: cs89x0.c,v 1.48 2020/01/29 14:14:55 thorpej Exp $	*/
 /*
  * Copyright (c) 2004 Christopher Gilbert
  * All rights reserved.
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the company nor the name of the author may be used to
  *    endorse or promote products derived from this software without specific
  *    prior written permission.
 @@ -202,27 +202,27 @@
 **     potentially more efficient.  That function needs to be gutted (to
 **     deal properly with alignment issues, which it currently does wrong),
 **     however, and the change doesn't gain much, so there's no point in
 **     enabling it now.
 **
 **     Revision 1.8  1997/05/19  01:17:10  cgd
 **     fix a comment re: the setting of the TxConfig register.  Clean up
 **     interface counter maintenance (make it use standard idiom).
 **
 **--
 */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.47 2019/05/29 10:07:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.48 2020/01/29 14:14:55 thorpej Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/bus.h>
 @@ -1452,27 +1452,27 @@ cs_counter_event(struct cs_softc *sc, ui
 		 * The tramsit event routine always checks the number of
 		 * collisions for any packet so we don't increment any
 		 * counters here, as they should already have been
 		 * considered.
 		 */
 		break;
 	case REG_NUM_RX_MISS:
 		/* The count should be read before an overflow occurs. */
 		errorCount = CS_READ_PACKET_PAGE(sc, PKTPG_RX_MISS);
 		/*
 		 * Increment the input error count, the first 6bits are the
 		 * register id.
 		 */
-		ifp->if_ierrors += ((errorCount & 0xffC0) >> 6);
+		if_statadd(ifp, if_ierrors, (errorCount & 0xffC0) >> 6);
 		break;
 	default:
 		/* Do nothing */
 		break;
+	}
+}
 void
 cs_buffer_event(struct cs_softc *sc, uint16_t bufEvent)
+{
 	/*
 	 * Multiple events can be in the buffer event register at one time so
 @@ -1518,27 +1518,27 @@ cs_buffer_event(struct cs_softc *sc, uin
 		printf("%s: software initiated interrupt\n",
 		    device_xname(sc->sc_dev));
+}
 void
 cs_transmit_event(struct cs_softc *sc, uint16_t txEvent)
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	/* If there were any errors transmitting this frame */
 	if (txEvent & (TX_EVENT_LOSS_CRS | TX_EVENT_SQE_ERR |
 	    TX_EVENT_OUT_WIN | TX_EVENT_JABBER | TX_EVENT_16_COLL)) {
 		/* Increment the output error count */
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		/* Note carrier loss. */
 		if (txEvent & TX_EVENT_LOSS_CRS)
 			sc->sc_carrier = 0;
 		/* If debugging is enabled then log error messages */
 		if (ifp->if_flags & IFF_DEBUG) {
 			if (txEvent & TX_EVENT_LOSS_CRS)
 				aprint_error_dev(sc->sc_dev, "lost carrier\n");
 			if (txEvent & TX_EVENT_SQE_ERR)
 				aprint_error_dev(sc->sc_dev, "SQE error\n");
 @@ -1552,32 +1552,35 @@ cs_transmit_event(struct cs_softc *sc, u
 			if (txEvent & TX_EVENT_16_COLL)
 				aprint_error_dev(sc->sc_dev,
 				    "16 collisions\n");
+		}
 	} else {
 		/* Transmission successful, carrier is up. */
 		sc->sc_carrier = 1;
 #ifdef SHARK
 		ledNetActive();
 #endif
+	}
 	/* Add the number of collisions for this frame */
 	net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 	if (txEvent & TX_EVENT_16_COLL)
-		ifp->if_collisions += 16;
+		if_statadd_ref(nsr, if_collisions, 16);
 	else
-		ifp->if_collisions += ((txEvent & TX_EVENT_COLL_MASK) >> 11);
+		if_statadd_ref(nsr, if_collisions,
 		    ((txEvent & TX_EVENT_COLL_MASK) >> 11));
-	ifp->if_opackets++;
+	if_statinc_ref(nsr, if_opackets);
 	IF_STAT_PUTREF(ifp);
 	/* Transmission is no longer in progress */
 	sc->sc_txbusy = FALSE;
 	/* If there is more to transmit, start the next transmission */
 	if_schedule_deferred_start(ifp);
+}
 void
 cs_print_rx_errors(struct cs_softc *sc, uint16_t rxEvent)
+{
 	if (rxEvent & RX_EVENT_RUNT)
 @@ -1595,27 +1598,27 @@ cs_print_rx_errors(struct cs_softc *sc,
 		if (rxEvent & RX_EVENT_DRIBBLE)
 			aprint_error_dev(sc->sc_dev, "dribble bits\n");
+	}
+}
 void
 cs_receive_event(struct cs_softc *sc, uint16_t rxEvent)
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	/* If the frame was not received OK */
 	if (!(rxEvent & RX_EVENT_RX_OK)) {
 		/* Increment the input error count */
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		/* If debugging is enabled then log error messages. */
 		if (ifp->if_flags & IFF_DEBUG) {
 			if (rxEvent != REG_NUM_RX_EVENT) {
 				cs_print_rx_errors(sc, rxEvent);
 				/*
 				 * Must read the length of all received
 				 * frames
 				 */
 				CS_READ_PACKET_PAGE(sc, PKTPG_RX_LENGTH);
 				/* Skip the received frame */
 @@ -1681,27 +1684,27 @@ cs_process_receive(struct cs_softc *sc)
 		aprint_error_dev(sc->sc_dev, "invalid packet length %d\n",
 		    totlen);
 		/* Skip the received frame */
 		CS_WRITE_PACKET_PAGE(sc, PKTPG_RX_CFG,
 			CS_READ_PACKET_PAGE(sc, PKTPG_RX_CFG) | RX_CFG_SKIP);
 		return;
+	}
 	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == 0) {
 		aprint_error_dev(sc->sc_dev,
 		    "cs_process_receive: unable to allocate mbuf\n");
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		/*
 		 * Couldn't allocate an mbuf so things are not good, may as
 		 * well drop the packet I think.
+		 *
 		 * have already read the length so we should be right to skip
 		 * the packet.
 		 */
 		CS_WRITE_PACKET_PAGE(sc, PKTPG_RX_CFG,
 		    CS_READ_PACKET_PAGE(sc, PKTPG_RX_CFG) | RX_CFG_SKIP);
 		return;
+	}
 	m_set_rcvif(m, ifp);
 	m->m_pkthdr.len = totlen;
 @@ -1763,27 +1766,27 @@ cs_process_rx_early(struct cs_softc *sc)
 	unsigned int frameOffset;
 	ifp = &sc->sc_ethercom.ec_if;
 	/* Initialize the frame offset */
 	frameOffset = PKTPG_RX_FRAME;
 	frameCount = 0;
 	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == 0) {
 		aprint_error_dev(sc->sc_dev,
 		    "cs_process_rx_early: unable to allocate mbuf\n");
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		/*
 		 * Couldn't allocate an mbuf so things are not good, may as
 		 * well drop the packet I think.
+		 *
 		 * have already read the length so we should be right to skip
 		 * the packet.
 		 */
 		CS_WRITE_PACKET_PAGE(sc, PKTPG_RX_CFG,
 		    CS_READ_PACKET_PAGE(sc, PKTPG_RX_CFG) | RX_CFG_SKIP);
 		return;
+	}
 	m_set_rcvif(m, ifp);
 	/*
 @@ -1838,27 +1841,27 @@ cs_process_rx_early(struct cs_softc *sc)
 		 * forced skip.
 		 */
 		rxEvent = CS_READ_PACKET_PAGE(sc, PKTPG_RX_STATUS);
 		rxEvent = CS_READ_PACKET_PAGE(sc, PKTPG_RX_LENGTH);
 		/*
 		 * Now read the RX_EVENT register to perform an implied skip.
 		 */
 		rxEvent = CS_READ_PACKET_PAGE(sc, PKTPG_RX_EVENT);
 		cs_ether_input(sc, m);
 	} else {
 		m_freem(m);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
+	}
+}
 void
 cs_start_output(struct ifnet *ifp)
+{
 	struct cs_softc *sc;
 	struct mbuf *pMbuf;
 	struct mbuf *pMbufChain;
 	uint16_t BusStatus;
 	uint16_t Length;
 	int txLoop = 0;
 	int dropout = 0;
 @@ -1932,27 +1935,27 @@ cs_start_output(struct ifnet *ifp)
 			BusStatus = CS_READ_PACKET_PAGE(sc, PKTPG_BUS_ST);
 			/*
 			 * If there was an error in the transmit bid free the
 			 * mbuf and go on. This is presuming that mbuf is
 			 * corrupt.
 			 */
 			if (BusStatus & BUS_ST_TX_BID_ERR) {
 				aprint_error_dev(sc->sc_dev,
 				    "transmit bid error (too big)");
 				/* Discard the bad mbuf chain */
 				m_freem(pMbufChain);
-				sc->sc_ethercom.ec_if.if_oerrors++;
+				if_statinc(&sc->sc_ethercom.ec_if, if_oerrors);
 				/* Loop up to transmit the next chain */
 				txLoop = 0;
 			} else {
 				if (BusStatus & BUS_ST_RDY4TXNOW) {
 					/*
 					 * The chip is ready for transmission
 					 * now
 					 */
 					/*
 					 * Copy the frame to the chip to
 					 * start transmission
 					 */
 @@ -1973,27 +1976,27 @@ cs_start_output(struct ifnet *ifp)
 					txLoop++;
 					if (txLoop > CS_OUTPUT_LOOP_MAX) {
 						/* Free the mbuf chain */
 						m_freem(pMbufChain);
 						/*
 						 * Transmission is not in
 						 * progress
 						 */
 						sc->sc_txbusy = FALSE;
 						/*
 						 * Increment the output error
 						 * count
 						 */
-						ifp->if_oerrors++;
+						if_statinc(ifp, if_oerrors);
 						/*
 						 * exit the routine and drop
 						 * the packet.
 						 */
 						txLoop = 0;
 						dropout = 1;
+					}
+				}
+			}
 		} while (txLoop);
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dm9000.c,v 1.21 2019/05/29 10:07:29 msaitoh Exp $	*/
+/*	$NetBSD: dm9000.c,v 1.22 2020/01/29 14:14:55 thorpej Exp $	*/
 /*
  * Copyright (c) 2009 Paul Fleischer
  * All rights reserved.
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the company nor the name of the author may be used to
  *    endorse or promote products derived from this software without specific
  *    prior written permission.
 @@ -550,29 +550,29 @@ int dme_intr(void *arg)
 		nsr = dme_read(sc, DM9000_NSR);
 		if (nsr & DM9000_NSR_TX1END) {
 			tx_status = dme_read(sc, DM9000_TSR1);
 			TX_DPRINTF(("dme_intr: Sent using channel 0\n"));
 		} else if (nsr & DM9000_NSR_TX2END) {
 			tx_status = dme_read(sc, DM9000_TSR2);
 			TX_DPRINTF(("dme_intr: Sent using channel 1\n"));
+		}
 		if (tx_status == 0x0) {
 			/* Frame successfully sent */
-			ifp->if_opackets++;
+			if_statinc(ifp, if_opackets);
 		} else {
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
+		}
 		/* If we have nothing ready to transmit, prepare something */
 		if (!sc->txready)
 			dme_prepare(sc, ifp);
 		if (sc->txready)
 			dme_transmit(sc);
 		/* Prepare the next frame */
 		dme_prepare(sc, ifp);
+	}
 @@ -787,38 +787,38 @@ dme_receive(struct dme_softc *sc, struct
 		ready = bus_space_read_1(sc->sc_iot, sc->sc_ioh, sc->dme_data);
 		ready &= 0x03;	/* we only want bits 1:0 */
 		if (ready == 0x01) {
 			uint8_t		rx_status;
 			struct mbuf	*m;
 			/* Read with address increment. */
 			bus_space_write_1(sc->sc_iot, sc->sc_ioh,
 					  sc->dme_io, DM9000_MRCMD);
 			rx_status = sc->sc_pkt_read(sc, ifp, &m);
 			if (m == NULL) {
 				/* failed to allocate a receive buffer */
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				RX_DPRINTF(("dme_receive: "
 					"Error allocating buffer\n"));
 			} else if (rx_status & (DM9000_RSR_CE | DM9000_RSR_PLE)) {
 				/* Error while receiving the packet,
 				 * discard it and keep track of counters
 				 */
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				RX_DPRINTF(("dme_receive: "
 					"Error reciving packet\n"));
 			} else if (rx_status & DM9000_RSR_LCS) {
-				ifp->if_collisions++;
+				if_statinc(ifp, if_collisions);
 			} else {
 				if_percpuq_enqueue(ifp->if_percpuq, m);
+			}
 		} else if (ready != 0x00) {
 			/* Should this be logged somehow? */
 			printf("%s: Resetting chip\n",
 			       device_xname(sc->sc_dev));
 			dme_reset(sc);
+		}
+	}
+}

 @@ -1,30 +1,30 @@
-/*	$NetBSD: dp8390.c,v 1.95 2019/05/29 10:07:29 msaitoh Exp $	*/
+/*	$NetBSD: dp8390.c,v 1.96 2020/01/29 14:14:55 thorpej Exp $	*/
 /*
  * Device driver for National Semiconductor DS8390/WD83C690 based ethernet
  * adapters.
+ *
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
+ *
  * Copyright (C) 1993, David Greenman.  This software may be used, modified,
  * copied, distributed, and sold, in both source and binary form provided that
  * the above copyright and these terms are retained.  Under no circumstances is
  * the author responsible for the proper functioning of this software, nor does
  * the author assume any responsibility for damages incurred with its use.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.95 2019/05/29 10:07:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.96 2020/01/29 14:14:55 thorpej Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/rndsource.h>
 #include <sys/bus.h>
 @@ -227,27 +227,27 @@ dp8390_stop(struct dp8390_softc *sc)
+}
 /*
  * Device timeout/watchdog routine.  Entered if the device neglects to generate
  * an interrupt after a transmit has been started on it.
  */
 void
 dp8390_watchdog(struct ifnet *ifp)
+{
 	struct dp8390_softc *sc = ifp->if_softc;
 	log(LOG_ERR, "%s: device timeout\n", device_xname(sc->sc_dev));
-	++sc->sc_ec.ec_if.if_oerrors;
+	if_statinc(ifp, if_oerrors);
 	dp8390_reset(sc);
+}
 /*
  * Initialize device.
  */
 void
 dp8390_init(struct dp8390_softc *sc)
+{
 	bus_space_tag_t regt = sc->sc_regt;
 	bus_space_handle_t regh = sc->sc_regh;
 	struct ifnet *ifp = &sc->sc_ec.ec_if;
 @@ -571,27 +571,27 @@ dp8390_rint(struct dp8390_softc *sc)
 		 */
 		if (len <= MCLBYTES &&
 		    packet_hdr.next_packet >= sc->rec_page_start &&
 		    packet_hdr.next_packet < sc->rec_page_stop) {
 			/* Go get packet. */
 			dp8390_read(sc,
 			    packet_ptr + sizeof(struct dp8390_ring),
 			    len - sizeof(struct dp8390_ring));
 		} else {
 			/* Really BAD.  The ring pointers are corrupted. */
 			log(LOG_ERR, "%s: NIC memory corrupt - "
 			    "invalid packet length %d\n",
 			    device_xname(sc->sc_dev), len);
-			++sc->sc_ec.ec_if.if_ierrors;
+			if_statinc(&sc->sc_ec.ec_if, if_ierrors);
 			dp8390_reset(sc);
 			return;
+		}
 		/* Update next packet pointer. */
 		sc->next_packet = packet_hdr.next_packet;
 		/*
 		 * Update NIC boundary pointer - being careful to keep it one
 		 * buffer behind (as recommended by NS databook).
 		 */
 		boundary = sc->next_packet - 1;
 		if (boundary < sc->rec_page_start)
 @@ -643,118 +643,122 @@ dp8390_intr(void *arg)
 				NIC_PUT(regt, regh, ED_P0_ISR, isr);
+			}
 		/*
 		 * Handle transmitter interrupts.  Handle these first because
 		 * the receiver will reset the board under some conditions.
+		 *
 		 * If the chip was reset while a packet was transmitting, it
 		 * may still deliver a TX interrupt.  In this case, just ignore
 		 * the interrupt.
 		 */
 		if ((isr & (ED_ISR_PTX | ED_ISR_TXE)) != 0 &&
 		    sc->txb_inuse != 0) {
 			net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 			uint8_t collisions =
 			    NIC_GET(regt, regh, ED_P0_NCR) & 0x0f;
 			/*
 			 * Check for transmit error.  If a TX completed with an
 			 * error, we end up throwing the packet away.  Really
 			 * the only error that is possible is excessive
 			 * collisions, and in this case it is best to allow the
 			 * automatic mechanisms of TCP to backoff the flow.  Of
 			 * course, with UDP we're screwed, but this is expected
 			 * when a network is heavily loaded.
 			 */
 			if ((isr & ED_ISR_TXE) != 0) {
 				/* Excessive collisions (16). */
 				if ((NIC_GET(regt, regh, ED_P0_TSR)
 				    & ED_TSR_ABT) && (collisions == 0)) {
 					/*
 					 * When collisions total 16, the P0_NCR
 					 * will indicate 0, and the TSR_ABT is
 					 * set.
 					 */
 					collisions = 16;
+				}
 				/* Update output errors counter. */
-				++ifp->if_oerrors;
+				if_statinc_ref(nsr, if_oerrors);
 			} else {
 				/*
 				 * Throw away the non-error status bits.
+				 *
 				 * XXX
 				 * It may be useful to detect loss of carrier
 				 * and late collisions here.
 				 */
 				(void)NIC_GET(regt, regh, ED_P0_TSR);
 				/*
 				 * Update total number of successfully
 				 * transmitted packets.
 				 */
-				++ifp->if_opackets;
+				if_statinc_ref(nsr, if_opackets);
+			}
 			/* Clear watchdog timer. */
 			ifp->if_timer = 0;
 			ifp->if_flags &= ~IFF_OACTIVE;
 			/*
 			 * Add in total number of collisions on last
 			 * transmission.
 			 */
-			ifp->if_collisions += collisions;
+			if (collisions)
 				if_statadd_ref(nsr, if_collisions, collisions);
 			IF_STAT_PUTREF(ifp);
 			/*
 			 * Decrement buffer in-use count if not zero (can only
 			 * be zero if a transmitter interrupt occurred while
 			 * not actually transmitting).
 			 * If data is ready to transmit, start it transmitting,
 			 * otherwise defer until after handling receiver.
 			 */
 			if (--sc->txb_inuse != 0)
 				dp8390_xmit(sc);
+		}
 		/* Handle receiver interrupts. */
 		if ((isr & (ED_ISR_PRX | ED_ISR_RXE | ED_ISR_OVW)) != 0) {
 			/*
 			 * Overwrite warning.  In order to make sure that a
 			 * lockup of the local DMA hasn't occurred, we reset
 			 * and re-init the NIC.  The NSC manual suggests only a
 			 * partial reset/re-init is necessary - but some chips
 			 * seem to want more.  The DMA lockup has been seen
 			 * only with early rev chips - Methinks this bug was
 			 * fixed in later revs.  -DG
 			 */
 			if ((isr & ED_ISR_OVW) != 0) {
-				++ifp->if_ierrors;
+				if_statinc(ifp, if_ierrors);
 #ifdef DIAGNOSTIC
 				log(LOG_WARNING, "%s: warning - receiver "
 				    "ring buffer overrun\n",
 				    device_xname(sc->sc_dev));
 #endif
 				/* Stop/reset/re-init NIC. */
 				dp8390_reset(sc);
 			} else {
 				/*
 				 * Receiver Error.  One or more of: CRC error,
 				 * frame alignment error FIFO overrun, or
 				 * missed packet.
 				 */
 				if ((isr & ED_ISR_RXE) != 0) {
-					++ifp->if_ierrors;
+					if_statinc(ifp, if_ierrors);
 #ifdef DEBUG
 					if (dp8390_debug) {
 						printf("%s: receive error %x\n",
 						    device_xname(sc->sc_dev),
 						    NIC_GET(regt, regh,
 							ED_P0_RSR));
+					}
 #endif
+				}
 				/*
 				 * Go get the packet(s)
 				 * XXX - Doing this on an error is dubious
 @@ -904,27 +908,27 @@ dp8390_ioctl(struct ifnet *ifp, u_long c
 /*
  * Retrieve packet from buffer memory and send to the next level up via
  * ether_input().  If there is a BPF listener, give a copy to BPF, too.
  */
 void
 dp8390_read(struct dp8390_softc *sc, int buf, u_short len)
+{
 	struct ifnet *ifp = &sc->sc_ec.ec_if;
 	struct mbuf *m;
 	/* Pull packet off interface. */
 	m = dp8390_get(sc, buf, len);
 	if (m == NULL) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	if_percpuq_enqueue(ifp->if_percpuq, m);
+}
 /*
  * Supporting routines.
  */
 /*
  * Compute the multicast address filter from the list of multicast addresses we

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dp83932.c,v 1.44 2019/05/28 07:41:48 msaitoh Exp $	*/
+/*	$NetBSD: dp83932.c,v 1.45 2020/01/29 14:14:55 thorpej Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,27 +25,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Device driver for the National Semiconductor DP83932
  * Systems-Oriented Network Interface Controller (SONIC).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.44 2019/05/28 07:41:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.45 2020/01/29 14:14:55 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <net/if.h>
 @@ -524,27 +524,27 @@ sonic_start(struct ifnet *ifp)
+}
 /*
  * sonic_watchdog:	[ifnet interface function]
+ *
  *	Watchdog timer handler.
  */
 void
 sonic_watchdog(struct ifnet *ifp)
+{
 	struct sonic_softc *sc = ifp->if_softc;
 	printf("%s: device timeout\n", device_xname(sc->sc_dev));
-	ifp->if_oerrors++;
+	if_statinc(ifp, if_oerrors);
 	(void)sonic_init(ifp);
+}
 /*
  * sonic_ioctl:		[ifnet interface function]
+ *
  *	Handle control requests from the operator.
  */
 int
 sonic_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	int s, error;
 @@ -658,31 +658,35 @@ sonic_txintr(struct sonic_softc *sc)
 			break;
 		totstat |= status;
 		bus_dmamap_sync(sc->sc_dmat, ds->ds_dmamap, 0,
 		    ds->ds_dmamap->dm_mapsize, BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->sc_dmat, ds->ds_dmamap);
 		m_freem(ds->ds_mbuf);
 		ds->ds_mbuf = NULL;
 		/*
 		 * Check for errors and collisions.
 		 */
 		net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 		if (status & TCR_PTX)
-			ifp->if_opackets++;
+			if_statinc_ref(nsr, if_opackets);
 		else
-			ifp->if_oerrors++;
+			if_statinc_ref(nsr, if_oerrors);
-		ifp->if_collisions += TDA_STATUS_NCOL(status);
+		if (TDA_STATUS_NCOL(status))
 			if_statadd_ref(nsr, if_collisions,
 			    TDA_STATUS_NCOL(status));
 		IF_STAT_PUTREF(ifp);
+	}
 	/* Update the dirty transmit buffer pointer. */
 	sc->sc_txdirty = i;
 	/*
 	 * Cancel the watchdog timer if there are no pending
 	 * transmissions.
 	 */
 	if (sc->sc_txpending == 0)
 		ifp->if_timer = 0;
 	return totstat;
 @@ -745,27 +749,27 @@ sonic_rxintr(struct sonic_softc *sc)
 		/*
 		 * Make sure the packet arrived OK.  If an error occurred,
 		 * update stats and reset the descriptor.  The buffer will
 		 * be reused the next time the descriptor comes up in the
 		 * ring.
 		 */
 		if ((status & RCR_PRX) == 0) {
 			if (status & RCR_FAER)
 				printf("%s: Rx frame alignment error\n",
 				    device_xname(sc->sc_dev));
 			else if (status & RCR_CRCR)
 				printf("%s: Rx CRC error\n",
 				    device_xname(sc->sc_dev));
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			SONIC_INIT_RXDESC(sc, i);
 			continue;
+		}
 		bus_dmamap_sync(sc->sc_dmat, ds->ds_dmamap, 0,
 		    ds->ds_dmamap->dm_mapsize, BUS_DMASYNC_POSTREAD);
 		/*
 		 * The SONIC includes the CRC with every packet.
 		 */
 		len = bytecount - ETHER_CRC_LEN;
 		/*
 @@ -817,27 +821,27 @@ sonic_rxintr(struct sonic_softc *sc)
 			/*
 			 * Note that we use a cluster for incoming frames,
 			 * so the buffer is virtually contiguous.
 			 */
 			memcpy(mtod(m, void *), mtod(ds->ds_mbuf, void *),
 			    len);
 			SONIC_INIT_RXDESC(sc, i);
 			bus_dmamap_sync(sc->sc_dmat, ds->ds_dmamap, 0,
 			    ds->ds_dmamap->dm_mapsize, BUS_DMASYNC_PREREAD);
 		} else {
 			m = ds->ds_mbuf;
 			if (sonic_add_rxbuf(sc, i) != 0) {
  dropit:
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				SONIC_INIT_RXDESC(sc, i);
 				bus_dmamap_sync(sc->sc_dmat, ds->ds_dmamap, 0,
 				    ds->ds_dmamap->dm_mapsize,
 				    BUS_DMASYNC_PREREAD);
 				continue;
+			}
+		}
 		m_set_rcvif(m, ifp);
 		m->m_pkthdr.len = m->m_len = len;
 		/* Pass it on. */
 		if_percpuq_enqueue(ifp->if_percpuq, m);

 @@ -1,14 +1,14 @@
-/* $NetBSD: dwc_gmac.c,v 1.68 2019/10/19 06:40:20 tnn Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.69 2020/01/29 14:14:55 thorpej Exp $ */
 /*-
  * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry and Martin Husemann.
+ *
  * 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.
 @@ -31,27 +31,27 @@
 /*
  * This driver supports the Synopsis Designware GMAC core, as found
  * on Allwinner A20 cores and others.
+ *
  * Real documentation seems to not be available, the marketing product
  * documents could be found here:
+ *
  *  http://www.synopsys.com/dw/ipdir.php?ds=dwc_ether_mac10_100_1000_unive
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.68 2019/10/19 06:40:20 tnn Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.69 2020/01/29 14:14:55 thorpej Exp $");
 /* #define	DWC_GMAC_DEBUG	1 */
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 @@ -1182,27 +1182,27 @@ dwc_gmac_tx_intr(struct dwc_gmac_softc *
 		 * a single tx descriptor (i)
 		 */
 		dwc_gmac_txdesc_sync(sc, i, i+1,
 		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 		desc = &sc->sc_txq.t_desc[i];
 		if (sc->sc_descm->tx_is_owned_by_dev(desc))
 			break;
 		data = &sc->sc_txq.t_data[i];
 		if (data->td_m == NULL)
 			continue;
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
 		nsegs = data->td_active->dm_nsegs;
 		bus_dmamap_sync(sc->sc_dmat, data->td_active, 0,
 		    data->td_active->dm_mapsize, BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->sc_dmat, data->td_active);
 #ifdef DWC_GMAC_DEBUG
 		aprint_normal_dev(sc->sc_dev,
 		    "dwc_gmac_tx_intr: done with packet at desc #%d, "
 		    "freeing mbuf %p\n", i, data->td_m);
 #endif
 		m_freem(data->td_m);
 		data->td_m = NULL;
 @@ -1235,77 +1235,77 @@ dwc_gmac_rx_intr(struct dwc_gmac_softc *
 		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 		desc = &sc->sc_rxq.r_desc[i];
 		data = &sc->sc_rxq.r_data[i];
 		if (sc->sc_descm->rx_is_owned_by_dev(desc))
 			break;
 		if (sc->sc_descm->rx_has_error(desc)) {
 #ifdef DWC_GMAC_DEBUG
 			aprint_normal_dev(sc->sc_dev,
 			    "RX error: descriptor status %08x, skipping\n",
 			    le32toh(desc->ddesc_status0));
 #endif
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			goto skip;
+		}
 		len = sc->sc_descm->rx_get_len(desc);
 #ifdef DWC_GMAC_DEBUG
 		aprint_normal_dev(sc->sc_dev,
 		    "rx int: device is done with descriptor #%d, len: %d\n",
 		    i, len);
 #endif
 		/*
 		 * Try to get a new mbuf before passing this one
 		 * up, if that fails, drop the packet and reuse
 		 * the existing one.
 		 */
 		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) == 0) {
 			m_freem(mnew);
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			goto skip;
+		}
 		mnew->m_len = mnew->m_pkthdr.len = mnew->m_ext.ext_size;
 		if (mnew->m_len > AWGE_MAX_PACKET) {
 			mnew->m_len = mnew->m_pkthdr.len = AWGE_MAX_PACKET;
+		}
 		/* unload old DMA map */
 		bus_dmamap_sync(sc->sc_dmat, data->rd_map, 0,
 		    data->rd_map->dm_mapsize, BUS_DMASYNC_POSTREAD);
 		bus_dmamap_unload(sc->sc_dmat, data->rd_map);
 		/* and reload with new mbuf */
 		error = bus_dmamap_load_mbuf(sc->sc_dmat, data->rd_map,
 		    mnew, BUS_DMA_READ | BUS_DMA_NOWAIT);
 		if (error != 0) {
 			m_freem(mnew);
 			/* try to reload old mbuf */
 			error = bus_dmamap_load_mbuf(sc->sc_dmat, data->rd_map,
 			    data->rd_m, BUS_DMA_READ | BUS_DMA_NOWAIT);
 			if (error != 0) {
 				panic("%s: could not load old rx mbuf",
 				    device_xname(sc->sc_dev));
+			}
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			goto skip;
+		}
 		physaddr = data->rd_map->dm_segs[0].ds_addr;
 		/*
 		 * New mbuf loaded, update RX ring and continue
 		 */
 		m = data->rd_m;
 		data->rd_m = mnew;
 		desc->ddesc_data = htole32(physaddr);
 		/* finalize mbuf */
 		m->m_pkthdr.len = m->m_len = len;
 @@ -1449,27 +1449,27 @@ dwc_gmac_intr(struct dwc_gmac_softc *sc)
 	if (dma_status & (GMAC_DMA_INT_NIE | GMAC_DMA_INT_AIE))
 		rv = 1;
 	if (dma_status & GMAC_DMA_INT_TIE)
 		dwc_gmac_tx_intr(sc);
 	if (dma_status & GMAC_DMA_INT_RIE)
 		dwc_gmac_rx_intr(sc);
 	/*
 	 * Check error conditions
 	 */
 	if (dma_status & GMAC_DMA_INT_ERRORS) {
-		sc->sc_ec.ec_if.if_oerrors++;
+		if_statinc(&sc->sc_ec.ec_if, if_oerrors);
 #ifdef DWC_GMAC_DEBUG
 		dwc_dump_and_abort(sc, "interrupt error condition");
 #endif
+	}
 	rnd_add_uint32(&sc->rnd_source, dma_status);
 	/* ack interrupt */
 	if (dma_status)
 		bus_space_write_4(sc->sc_bst, sc->sc_bsh,
 		    AWIN_GMAC_DMA_STATUS, dma_status & GMAC_DMA_INT_MASK);
 	/*