 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_de.c,v 1.34 2018/06/26 06:48:02 msaitoh Exp $	*/
+/*	$NetBSD: if_de.c,v 1.35 2020/01/29 05:57:21 thorpej Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * 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
 @@ -62,27 +62,27 @@
 /*
  * DEC DEUNA interface
+ *
  *	Lou Salkind
  *	New York University
+ *
  *	Rewritten by Ragge 30 April 2000 to match new world.
+ *
  * TODO:
  *	timeout routine (get statistics)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.34 2018/06/26 06:48:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.35 2020/01/29 05:57:21 thorpej Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 @@ -470,39 +470,39 @@ deintr(void *arg)
 	/*
 	 * Poll transmit ring and check status.
 	 * Be careful about loopback requests.
 	 * Then free buffer space and check for
 	 * more transmit requests.
 	 */
 	dc = sc->sc_dedata;
 	for ( ; sc->sc_nxmit > 0; sc->sc_nxmit--) {
 		rp = &dc->dc_xrent[sc->sc_xindex];
 		if (rp->r_flags & XFLG_OWN)
 			break;
-		sc->sc_if.if_opackets++;
+		if_statinc(&sc->sc_if, if_opackets);
 		ifxp = &sc->sc_ifw[sc->sc_xindex];
 		/* check for unusual conditions */
 		if (rp->r_flags & (XFLG_ERRS|XFLG_MTCH|XFLG_ONE|XFLG_MORE)) {
 			if (rp->r_flags & XFLG_ERRS) {
 				/* output error */
-				sc->sc_if.if_oerrors++;
+				if_statinc(&sc->sc_if, if_oerrors);
 			} else if (rp->r_flags & XFLG_ONE) {
 				/* one collision */
-				sc->sc_if.if_collisions++;
+				if_statinc(&sc->sc_if, if_collisions);
 			} else if (rp->r_flags & XFLG_MORE) {
-				/* more than one collision */
+				/* more than one collision (guess...) */
-				sc->sc_if.if_collisions += 2;	/* guess */
+				if_statadd(&sc->sc_if, if_collisions, 2);
+			}
+		}
 		if_ubaend(&sc->sc_ifuba, ifxp);
 		/* check if next transmit buffer also finished */
 		sc->sc_xindex++;
 		if (sc->sc_xindex == NXMT)
 			sc->sc_xindex = 0;
+	}
 	sc->sc_if.if_flags &= ~IFF_OACTIVE;
 	destart(&sc->sc_if);
 	if (csr0 & PCSR0_RCBI) {
 		DE_WLOW(PCSR0_INTE|CMD_PDMD);
 @@ -524,33 +524,33 @@ derecv(struct de_softc *sc)
 	struct ifnet *ifp = &sc->sc_if;
 	struct de_ring *rp;
 	struct de_cdata *dc;
 	struct mbuf *m;
 	int len;
 	dc = sc->sc_dedata;
 	rp = &dc->dc_rrent[sc->sc_rindex];
 	while ((rp->r_flags & RFLG_OWN) == 0) {
 		len = (rp->r_lenerr&RERR_MLEN) - ETHER_CRC_LEN;
 		/* check for errors */
 		if ((rp->r_flags & (RFLG_ERRS|RFLG_FRAM|RFLG_OFLO|RFLG_CRC)) ||
 		    (rp->r_lenerr & (RERR_BUFL|RERR_UBTO))) {
-			sc->sc_if.if_ierrors++;
+			if_statinc(&sc->sc_if, if_ierrors);
 			goto next;
+		}
 		m = if_ubaget(&sc->sc_ifuba, &sc->sc_ifr[sc->sc_rindex],
 		    ifp, len);
 		if (m == 0) {
-			sc->sc_if.if_ierrors++;
+			if_statinc(&sc->sc_if, if_ierrors);
 			goto next;
+		}
 		if_percpuq_enqueue(ifp->if_percpuq, m);
 		/* hang the receive buffer again */
 next:		rp->r_lenerr = 0;
 		rp->r_flags = RFLG_OWN;
 		/* check next receive buffer */
 		sc->sc_rindex++;
 		if (sc->sc_rindex == NRCV)
 			sc->sc_rindex = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_qt.c,v 1.24 2019/10/21 08:22:06 msaitoh Exp $	*/
+/*	$NetBSD: if_qt.c,v 1.25 2020/01/29 05:57:21 thorpej Exp $	*/
 /*
  * Copyright (c) 1992 Steven M. Schultz
  * 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.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -70,27 +70,27 @@
  *	Darned alignment restrictions!
+ *
  *	A couple of typos were corrected (missing parentheses, reversed
  *	arguments to printf calls, etc).
+ *
  * 13-Oct-92 -- sms@wlv.iipo.gtegsc.com
  *	Created based on the DELQA-PLUS addendum to DELQA User's Guide.
  *	This driver ('qt') is selected at system configuration time.  If the
  *	board *	is not a DELQA-YM an error message will be printed and the
  *	interface will not be attached.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.24 2019/10/21 08:22:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.25 2020/01/29 05:57:21 thorpej Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 #include <sys/time.h>
 @@ -497,98 +497,94 @@ qtintr(void *arg)
 	qtstart(&sc->is_ec.ec_if);
+	}
 /*
  * Transmit interrupt service.  Only called if there are outstanding transmit
  * requests which could have completed.  The DELQA-YM doesn't provide the
  * status bits telling the kind (receive, transmit) of interrupt.
 */
 #define BBLMIS (TMD2_BBL|TMD2_MIS)
 void
 qttint(struct qt_softc *sc)
+{
 	struct qt_tring *rp;
-	while (sc->nxmit > 0)
+	while (sc->nxmit > 0) {
 		rp = &sc->sc_ib->qc_t[sc->xlast];
 		if ((rp->tmd3 & TMD3_OWN) == 0)
 			break;
-		sc->is_if.if_opackets++;
+		if_statinc(&sc->is_if, if_opackets);
 /*
  * Collisions don't count as output errors, but babbling and missing packets
  * do count as output errors.
 */
-		if	(rp->tmd2 & TMD2_CER)
+		if (rp->tmd2 & TMD2_CER)
-			sc->is_if.if_collisions++;
+			if_statinc(&sc->is_if, if_collisions);
-		if	((rp->tmd0 & TMD0_ERR1) ||
+		if ((rp->tmd0 & TMD0_ERR1) ||
-			 ((rp->tmd2 & TMD2_ERR2) && (rp->tmd2 & BBLMIS)))
+		    ((rp->tmd2 & TMD2_ERR2) && (rp->tmd2 & BBLMIS))) {
 #ifdef QTDEBUG
 			char buf[100];
 			snprintb(buf, sizeof(buf), TMD2_BITS, rp->tmd2);
 			printf("%s: tmd2 %s\n", device_xname(sc->sc_dev), buf);
 #endif
-			sc->is_if.if_oerrors++;
+			if_statinc(&sc->is_if, if_oerrors);
+		}
 		if_ubaend(&sc->sc_ifuba, &sc->sc_ifw[sc->xlast]);
-		if	(++sc->xlast >= NXMT)
+		if (++sc->xlast >= NXMT)
 			sc->xlast = 0;
 		sc->nxmit--;
+	}
+}
 /*
  * Receive interrupt service.  Pull packet off the interface and put into
  * a mbuf chain for processing later.
 */
 void
 qtrint(struct qt_softc *sc)
+{
 	struct qt_rring *rp;
 	struct ifnet *ifp = &sc->is_ec.ec_if;
 	struct mbuf *m;
 	int	len;
 	while	(sc->sc_ib->qc_r[(int)sc->rindex].rmd3 & RMD3_OWN)
+		{
 		rp = &sc->sc_ib->qc_r[(int)sc->rindex];
-		if     ((rp->rmd0 & (RMD0_STP|RMD0_ENP)) != (RMD0_STP|RMD0_ENP))
+		if ((rp->rmd0 & (RMD0_STP|RMD0_ENP)) != (RMD0_STP|RMD0_ENP)) {
 			printf("%s: chained packet\n", device_xname(sc->sc_dev));
-			sc->is_if.if_ierrors++;
+			if_statinc(&sc->is_if, if_ierrors);
 			goto rnext;
+		}
 		len = (rp->rmd1 & RMD1_MCNT) - 4;	/* -4 for CRC */
-		if	((rp->rmd0 & RMD0_ERR3) || (rp->rmd2 & RMD2_ERR4))
+		if ((rp->rmd0 & RMD0_ERR3) || (rp->rmd2 & RMD2_ERR4)) {
 #ifdef QTDEBUG
 			char buf[100];
 			snprintb(buf, sizeof(buf), RMD0_BITS, rp->rmd0);
 			printf("%s: rmd0 %s\n", device_xname(sc->sc_dev), buf);
 			snprintb(buf, sizeof(buf), RMD2_BITS, rp->rmd2);
 			printf("%s: rmd2 %s\n", device_xname(sc->sc_dev), buf);
 #endif
-			sc->is_if.if_ierrors++;
+			if_statinc(&sc->is_if, if_ierrors);
 			goto rnext;
+		}
 		m = if_ubaget(&sc->sc_ifuba, &sc->sc_ifr[(int)sc->rindex],
 		    ifp, len);
 		if (m == 0) {
-			sc->is_if.if_ierrors++;
+			if_statinc(&sc->is_if, if_ierrors);
 			goto rnext;
+		}
 		if_percpuq_enqueue(ifp->if_percpuq, m);
 rnext:
 		--sc->nrcv;
 		rp->rmd3 = 0;
 		rp->rmd1 = MCLBYTES;
 		if	(++sc->rindex >= NRCV)
 			sc->rindex = 0;
+		}
 	QT_WCSR(CSR_ARQR, ARQR_RRQ);	/* tell device it has buffer */
+	}