 @@ -1,41 +1,41 @@
-/*	$NetBSD: mb8795.c,v 1.65 2019/05/29 10:07:29 msaitoh Exp $	*/
+/*	$NetBSD: mb8795.c,v 1.66 2020/01/29 05:31:10 thorpej Exp $	*/
 /*
  * Copyright (c) 1998 Darrin B. Jewell
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND 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 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: mb8795.c,v 1.65 2019/05/29 10:07:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.66 2020/01/29 05:31:10 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/rndsource.h>
 @@ -273,27 +273,27 @@ mb8795_rint(struct mb8795_softc *sc)
 		DPRINTF(("%s: rx CRC error\n", device_xname(sc->sc_dev)));
 #if 0
 		error++;
 #endif
+	}
 	if (rxstat & MB8795_RXSTAT_OVERFLOW) {
 		DPRINTF(("%s: rx overflow error\n", device_xname(sc->sc_dev)));
 #if 0
 		error++;
 #endif
+	}
 	if (error) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		/* @@@ handle more gracefully, free memory, etc. */
+	}
 	if (rxstat & MB8795_RXSTAT_OK) {
 		struct mbuf *m;
 		int s;
 		s = spldma();
 		while ((m = MBDMA_RX_MBUF (sc))) {
 			/* CRC is included with the packet; trim it. */
 			m->m_pkthdr.len = m->m_len = m->m_len - ETHER_CRC_LEN;
 			m_set_rcvif(m, ifp);
 @@ -375,40 +375,40 @@ mb8795_tint(struct mb8795_softc *sc)
 		/* MB_WRITE_REG(sc, MB8795_TXMASK, txmask & ~MB8795_TXMASK_TXRXIE); */
 		MB_WRITE_REG(sc, MB8795_TXMASK, 0);
 		if ((ifp->if_flags & IFF_RUNNING)
 		    && !IF_IS_EMPTY(&sc->sc_tx_snd)) {
 			void mb8795_start_dma(struct mb8795_softc *); /* XXX */
 			/* printf ("Z"); */
 			mb8795_start_dma(sc);
+		}
 		return;
+	}
 	if (txstat & MB8795_TXSTAT_SHORTED) {
 		printf("%s: tx cable shorted\n", device_xname(sc->sc_dev));
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
+	}
 	if (txstat & MB8795_TXSTAT_UNDERFLOW) {
 		printf("%s: tx underflow\n", device_xname(sc->sc_dev));
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
+	}
 	if (txstat & MB8795_TXSTAT_COLLERR) {
 		DPRINTF(("%s: tx collision\n", device_xname(sc->sc_dev)));
-		ifp->if_collisions++;
+		if_statinc(ifp, if_collisions);
+	}
 	if (txstat & MB8795_TXSTAT_COLLERR16) {
 		printf("%s: tx 16th collision\n", device_xname(sc->sc_dev));
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
-		ifp->if_collisions += 16;
+		if_statadd(ifp, if_collisions, 16);
+	}
 #if 0
 	if (txstat & MB8795_TXSTAT_READY) {
 		char sbuf[256];
 		snprintb(sbuf, sizeof(sbuf), MB8795_TXSTAT_BITS, txstat);
 		panic("%s: unexpected tx interrupt %s",
 				device_xname(sc->sc_dev), sbuf);
 		/* turn interrupt off */
 		MB_WRITE_REG(sc, MB8795_TXMASK,
 		    txmask & ~MB8795_TXMASK_READYIE);
 @@ -473,30 +473,27 @@ mb8795_reset(struct mb8795_softc *sc)
 		 sizeof(sc->sc_enaddr)));
 	MB_WRITE_REG(sc, MB8795_RESET, 0);
 	splx(s);
+}
 void
 mb8795_watchdog(struct ifnet *ifp)
+{
 	struct mb8795_softc *sc = ifp->if_softc;
 	log(LOG_ERR, "%s: device timeout\n", device_xname(sc->sc_dev));
-	++ifp->if_oerrors;
+	if_statinc(ifp, if_oerrors);
 	DPRINTF(("%s: %lld input errors, %lld input packets\n",
 		device_xname(sc->sc_dev), ifp->if_ierrors, ifp->if_ipackets));
 	ifp->if_flags &= ~IFF_RUNNING;
 	mb8795_init(sc);
+}
 /*
  * Initialization of interface; set up initialization block
  * and transmit/receive descriptor rings.
  */
 void
 mb8795_init(struct mb8795_softc *sc)
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 @@ -752,17 +749,17 @@ mb8795_start_dma(struct mb8795_softc *sc
 	/* MB_WRITE_REG(sc, MB8795_TXMASK, txmask | MB8795_TXMASK_READYIE); */
 	/* MB_WRITE_REG(sc, MB8795_TXMASK, txmask | MB8795_TXMASK_TXRXIE); */
 	ifp->if_timer = 5;
 	if (MBDMA_TX_MBUF(sc, m))
 		return;
 	MBDMA_TX_GO(sc);
 	if (turbo)
 		MB_WRITE_REG(sc, MB8795_TXMODE,
 		    MB8795_TXMODE_TURBO1 | MB8795_TXMODE_TURBOSTART);
-	ifp->if_opackets++;
+	if_statinc(ifp, if_opackets);
+}
 /****************************************************************/