 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_pcn.c,v 1.72 2019/10/11 14:22:46 msaitoh Exp $	*/
+/*	$NetBSD: if_pcn.c,v 1.73 2020/01/29 06:46:58 thorpej Exp $	*/
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -55,27 +55,27 @@
  *	  Ethernet Controller with Integrated PHY
+ *
  * This also supports the virtual PCnet-PCI Ethernet interface found
  * in VMware.
+ *
  * TODO:
+ *
  *	* Split this into bus-specific and bus-independent portions.
  *	  The core could also be used for the ILACC (Am79900) 32-bit
  *	  Ethernet chip (XXX only if we use an ILACC-compatible SWSTYLE).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.72 2019/10/11 14:22:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.73 2020/01/29 06:46:58 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>
 #include <sys/queue.h>
 @@ -1153,27 +1153,27 @@ static void
 pcn_watchdog(struct ifnet *ifp)
+{
 	struct pcn_softc *sc = ifp->if_softc;
 	/*
 	 * Since we're not interrupting every packet, sweep
 	 * up before we report an error.
 	 */
 	pcn_txintr(sc);
 	if (sc->sc_txfree != PCN_NTXDESC) {
 		printf("%s: device timeout (txfree %d txsfree %d)\n",
 		    device_xname(sc->sc_dev), sc->sc_txfree, sc->sc_txsfree);
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		/* Reset the interface. */
 		(void) pcn_init(ifp);
+	}
 	/* Try to get more packets going. */
 	pcn_start(ifp);
+}
 /*
  * pcn_ioctl:		[ifnet interface function]
+ *
  *	Handle control requests from the operator.
 @@ -1238,52 +1238,52 @@ pcn_intr(void *arg)
 		if (csr0 & LE_C0_RINT) {
 			PCN_EVCNT_INCR(&sc->sc_ev_rxintr);
 			wantinit = pcn_rxintr(sc);
+		}
 		if (csr0 & LE_C0_TINT) {
 			PCN_EVCNT_INCR(&sc->sc_ev_txintr);
 			pcn_txintr(sc);
+		}
 		if (csr0 & LE_C0_ERR) {
 			if (csr0 & LE_C0_BABL) {
 				PCN_EVCNT_INCR(&sc->sc_ev_babl);
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
+			}
 			if (csr0 & LE_C0_MISS) {
 				PCN_EVCNT_INCR(&sc->sc_ev_miss);
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
+			}
 			if (csr0 & LE_C0_MERR) {
 				PCN_EVCNT_INCR(&sc->sc_ev_merr);
 				printf("%s: memory error\n",
 				    device_xname(sc->sc_dev));
 				wantinit = 1;
 				break;
+			}
+		}
 		if ((csr0 & LE_C0_RXON) == 0) {
 			printf("%s: receiver disabled\n",
 			    device_xname(sc->sc_dev));
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			wantinit = 1;
+		}
 		if ((csr0 & LE_C0_TXON) == 0) {
 			printf("%s: transmitter disabled\n",
 			    device_xname(sc->sc_dev));
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			wantinit = 1;
+		}
+	}
 	if (handled) {
 		if (wantinit)
 			pcn_init(ifp);
 		/* Try to get more packets going. */
 		if_schedule_deferred_start(ifp);
+	}
 	return handled;
 @@ -1339,27 +1339,27 @@ pcn_txintr(struct pcn_softc *sc)
 		tmd1 = le32toh(sc->sc_txdescs[txs->txs_lastdesc].tmd1);
 		if (tmd1 & LE_T1_OWN)
 			break;
 		/*
 		 * Slightly annoying -- we have to loop through the
 		 * descriptors we've used looking for ERR, since it
 		 * can appear on any descriptor in the chain.
 		 */
 		for (j = txs->txs_firstdesc;; j = PCN_NEXTTX(j)) {
 			tmd = le32toh(sc->sc_txdescs[j].tmd1);
 			if (tmd & LE_T1_ERR) {
-				ifp->if_oerrors++;
+				if_statinc(ifp, if_oerrors);
 				if (sc->sc_swstyle == LE_B20_SSTYLE_PCNETPCI3)
 					tmd2 = le32toh(sc->sc_txdescs[j].tmd0);
 				else
 					tmd2 = le32toh(sc->sc_txdescs[j].tmd2);
 				if (tmd2 & LE_T2_UFLO) {
 					if (sc->sc_xmtsp < LE_C80_XMTSP_MAX) {
 						sc->sc_xmtsp++;
 						printf("%s: transmit "
 						    "underrun; new threshold: "
 						    "%s\n",
 						    device_xname(sc->sc_dev),
 						    sc->sc_xmtsp_desc[
 						    sc->sc_xmtsp]);
 @@ -1370,41 +1370,41 @@ pcn_txintr(struct pcn_softc *sc)
 						    LE_C80_XMTFW(sc->sc_xmtfw));
 						pcn_csr_write(sc, LE_CSR5,
 						    sc->sc_csr5);
 					} else {
 						printf("%s: transmit "
 						    "underrun\n",
 						    device_xname(sc->sc_dev));
+					}
 				} else if (tmd2 & LE_T2_BUFF) {
 					printf("%s: transmit buffer error\n",
 					    device_xname(sc->sc_dev));
+				}
 				if (tmd2 & LE_T2_LCOL)
-					ifp->if_collisions++;
+					if_statinc(ifp, if_collisions);
 				if (tmd2 & LE_T2_RTRY)
-					ifp->if_collisions += 16;
+					if_statadd(ifp, if_collisions, 16);
 				goto next_packet;
+			}
 			if (j == txs->txs_lastdesc)
 				break;
+		}
 		if (tmd1 & LE_T1_ONE)
-			ifp->if_collisions++;
+			if_statinc(ifp, if_collisions);
 		else if (tmd & LE_T1_MORE) {
 			/* Real number is unknown. */
-			ifp->if_collisions += 2;
+			if_statadd(ifp, if_collisions, 2);
+		}
-		ifp->if_opackets++;
+		if_statinc(ifp, if_opackets);
  next_packet:
 		sc->sc_txfree += txs->txs_dmamap->dm_nsegs;
 		bus_dmamap_sync(sc->sc_dmat, txs->txs_dmamap,
 , txs->txs_dmamap->dm_mapsize, BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->sc_dmat, txs->txs_dmamap);
 		m_freem(txs->txs_mbuf);
 		txs->txs_mbuf = NULL;
+	}
 	/* Update the dirty transmit buffer pointer. */
 	sc->sc_txsdirty = i;
 	/*
 @@ -1451,27 +1451,27 @@ pcn_rxintr(struct pcn_softc *sc)
 			/* Make sure the packet is in a single buffer. */
 			if ((rmd1 & (LE_R1_STP | LE_R1_ENP)) !=
 			    (LE_R1_STP | LE_R1_ENP)) {
 				printf("%s: packet spilled into next buffer\n",
 				    device_xname(sc->sc_dev));
 				return 1;	/* pcn_intr() will re-init */
+			}
 			/*
 			 * If the packet had an error, simple recycle the
 			 * buffer.
 			 */
 			if (rmd1 & LE_R1_ERR) {
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				/*
 				 * If we got an overflow error, chances
 				 * are there will be a CRC error.  In
 				 * this case, just print the overflow
 				 * error, and skip the others.
 				 */
 				if (rmd1 & LE_R1_OFLO)
 					printf("%s: overflow error\n",
 					    device_xname(sc->sc_dev));
 				else {
 #define	PRINTIT(x, str)							\
 					if (rmd1 & (x))			\
 						printf("%s: %s\n",	\
 @@ -1520,27 +1520,27 @@ pcn_rxintr(struct pcn_softc *sc)
 			if (m == NULL)
 				goto dropit;
 			m->m_data += 2;
 			memcpy(mtod(m, void *),
 			    mtod(rxs->rxs_mbuf, void *), len);
 			PCN_INIT_RXDESC(sc, i);
 			bus_dmamap_sync(sc->sc_dmat, rxs->rxs_dmamap, 0,
 			    rxs->rxs_dmamap->dm_mapsize,
 			    BUS_DMASYNC_PREREAD);
 		} else {
 			m = rxs->rxs_mbuf;
 			if (pcn_add_rxbuf(sc, i) != 0) {
  dropit:
-				ifp->if_ierrors++;
+				if_statinc(ifp, if_ierrors);
 				PCN_INIT_RXDESC(sc, i);
 				bus_dmamap_sync(sc->sc_dmat,
 				    rxs->rxs_dmamap, 0,
 				    rxs->rxs_dmamap->dm_mapsize,
 				    BUS_DMASYNC_PREREAD);
 				continue;
+			}
+		}
 		m_set_rcvif(m, ifp);
 		m->m_pkthdr.len = m->m_len = len;
 		/* Pass it on. */