 @@ -1,14 +1,14 @@
-/*	$NetBSD: tulip.c,v 1.200 2019/11/10 21:16:35 chs Exp $	*/
+/*	$NetBSD: tulip.c,v 1.201 2020/01/29 14:18:54 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center; and by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -26,27 +26,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 Digital Semiconductor ``Tulip'' (21x4x)
  * Ethernet controller family, and a variety of clone chips.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.200 2019/11/10 21:16:35 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.201 2020/01/29 14:18:54 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 @@ -930,30 +930,30 @@ tlp_start(struct ifnet *ifp)
  */
 static void
 tlp_watchdog(struct ifnet *ifp)
+{
 	struct tulip_softc *sc = ifp->if_softc;
 	int doing_setup, doing_transmit;
 	doing_setup = (sc->sc_flags & TULIPF_DOING_SETUP);
 	doing_transmit = (! SIMPLEQ_EMPTY(&sc->sc_txdirtyq));
 	if (doing_setup && doing_transmit) {
 		printf("%s: filter setup and transmit timeout\n",
 		    device_xname(sc->sc_dev));
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 	} else if (doing_transmit) {
 		printf("%s: transmit timeout\n", device_xname(sc->sc_dev));
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 	} else if (doing_setup)
 		printf("%s: filter setup timeout\n", device_xname(sc->sc_dev));
 	else
 		printf("%s: spurious watchdog timeout\n",
 		    device_xname(sc->sc_dev));
 	(void) tlp_init(ifp);
 	/* Try to get more packets going. */
 	tlp_start(ifp);
+}
 /* If the interface is up and running, only modify the receive
 @@ -1241,27 +1241,27 @@ tlp_rxintr(struct tulip_softc *sc)
 		 */
 		if ((rxstat & (TDSTAT_Rx_FS | TDSTAT_Rx_LS)) !=
 		    (TDSTAT_Rx_FS | TDSTAT_Rx_LS)) {
 			printf("%s: incoming packet spilled, resetting\n",
 			    device_xname(sc->sc_dev));
 			(void) tlp_init(ifp);
 			return;
+		}
 		/*
 		 * If any collisions were seen on the wire, count one.
 		 */
 		if (rxstat & TDSTAT_Rx_CS)
-			ifp->if_collisions++;
+			if_statinc(ifp, if_collisions);
 		/*
 		 * If an error occurred, update stats, clear the status
 		 * word, and leave the packet buffer in place.  It will
 		 * simply be reused the next time the ring comes around.
 		 */
 		errors = TDSTAT_Rx_DE | TDSTAT_Rx_RF | TDSTAT_Rx_TL |
 		    TDSTAT_Rx_CS | TDSTAT_Rx_RE | TDSTAT_Rx_DB | TDSTAT_Rx_CE;
 		/*
 	 	 * If 802.1Q VLAN MTU is enabled, ignore the Frame Too Long
 		 * error.
 		 */
 		if ((sc->sc_ethercom.ec_capenable & ETHERCAP_VLAN_MTU) != 0)
 @@ -1269,27 +1269,27 @@ tlp_rxintr(struct tulip_softc *sc)
 		/*
 		 * If chip doesn't have MII, ignore the MII error bit.
 		 */
 		if ((sc->sc_flags & TULIPF_HAS_MII) == 0)
 			errors &= ~TDSTAT_Rx_RE;
 		if ((rxstat & TDSTAT_ES) != 0 &&
 		    (rxstat & errors) != 0) {
 			rxstat &= errors;
 #define	PRINTERR(bit, str)						\
 			if (rxstat & (bit))				\
 				aprint_error_dev(sc->sc_dev,		\
 				    "receive error: %s\n", str)
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			PRINTERR(TDSTAT_Rx_DE, "descriptor error");
 			PRINTERR(TDSTAT_Rx_RF, "runt frame");
 			PRINTERR(TDSTAT_Rx_TL, "frame too long");
 			PRINTERR(TDSTAT_Rx_RE, "MII error");
 			PRINTERR(TDSTAT_Rx_DB, "dribbling bit");
 			PRINTERR(TDSTAT_Rx_CE, "CRC error");
 #undef PRINTERR
 			TULIP_INIT_RXDESC(sc, i);
 			continue;
+		}
 		bus_dmamap_sync(sc->sc_dmat, rxs->rxs_dmamap, 0,
 		    rxs->rxs_dmamap->dm_mapsize, BUS_DMASYNC_POSTREAD);
 @@ -1298,43 +1298,43 @@ tlp_rxintr(struct tulip_softc *sc)
 		 * No errors; receive the packet.  Note the Tulip
 		 * includes the CRC with every packet.
 		 */
 		len = TDSTAT_Rx_LENGTH(rxstat) - ETHER_CRC_LEN;
 #ifdef __NO_STRICT_ALIGNMENT
 		/*
 		 * Allocate a new mbuf cluster.  If that fails, we are
 		 * out of memory, and must drop the packet and recycle
 		 * the buffer that's already attached to this descriptor.
 		 */
 		m = rxs->rxs_mbuf;
 		if (tlp_add_rxbuf(sc, i) != 0) {
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			TULIP_INIT_RXDESC(sc, i);
 			bus_dmamap_sync(sc->sc_dmat, rxs->rxs_dmamap, 0,
 			    rxs->rxs_dmamap->dm_mapsize, BUS_DMASYNC_PREREAD);
 			continue;
+		}
 #else
 		/*
 		 * The Tulip's receive buffers must be 4-byte aligned.
 		 * But this means that the data after the Ethernet header
 		 * is misaligned.  We must allocate a new buffer and
 		 * copy the data, shifted forward 2 bytes.
 		 */
 		MGETHDR(m, M_DONTWAIT, MT_DATA);
 		if (m == NULL) {
  dropit:
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			TULIP_INIT_RXDESC(sc, i);
 			bus_dmamap_sync(sc->sc_dmat, rxs->rxs_dmamap, 0,
 			    rxs->rxs_dmamap->dm_mapsize, BUS_DMASYNC_PREREAD);
 			continue;
+		}
 		MCLAIM(m, &sc->sc_ethercom.ec_rx_mowner);
 		if (len > (MHLEN - 2)) {
 			MCLGET(m, M_DONTWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_freem(m);
 				goto dropit;
+			}
+		}
 @@ -1481,38 +1481,40 @@ tlp_txintr(struct tulip_softc *sc)
 		/*
 		 * Check for errors and collisions.
 		 */
 #ifdef TLP_STATS
 		if (txstat & TDSTAT_Tx_UF)
 			sc->sc_stats.ts_tx_uf++;
 		if (txstat & TDSTAT_Tx_TO)
 			sc->sc_stats.ts_tx_to++;
 		if (txstat & TDSTAT_Tx_EC)
 			sc->sc_stats.ts_tx_ec++;
 		if (txstat & TDSTAT_Tx_LC)
 			sc->sc_stats.ts_tx_lc++;
 #endif
 		net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 		if (txstat & (TDSTAT_Tx_UF | TDSTAT_Tx_TO))
-			ifp->if_oerrors++;
+			if_statinc_ref(nsr, if_oerrors);
 		if (txstat & TDSTAT_Tx_EC)
-			ifp->if_collisions += 16;
+			if_statadd_ref(nsr, if_collisions, 16);
 		else
-			ifp->if_collisions += TDSTAT_Tx_COLLISIONS(txstat);
+			if_statadd_ref(nsr, if_collisions,
 			    TDSTAT_Tx_COLLISIONS(txstat));
 		if (txstat & TDSTAT_Tx_LC)
-			ifp->if_collisions++;
+			if_statinc_ref(nsr, if_collisions);
-		ifp->if_opackets++;
+		if_statinc_ref(nsr, if_opackets);
 		IF_STAT_PUTREF(ifp);
+	}
 	/*
 	 * If there are no more pending transmissions, cancel the watchdog
 	 * timer.
 	 */
 	if (txs == NULL && (sc->sc_flags & TULIPF_DOING_SETUP) == 0)
 		ifp->if_timer = 0;
 	/*
 	 * If we have a receive filter setup pending, do it now.
 	 */
 	if (sc->sc_flags & TULIPF_WANT_SETUP)