 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_fwip.c,v 1.29 2018/11/15 10:23:55 maxv Exp $	*/
+/*	$NetBSD: if_fwip.c,v 1.30 2020/01/29 06:19:39 thorpej Exp $	*/
 /*-
  * Copyright (c) 2004
  *	Doug Rabson
  * Copyright (c) 2002-2003
  * 	Hidetoshi Shimokawa. 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
 @@ -28,27 +28,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS 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.
+ *
  * $FreeBSD: src/sys/dev/firewire/if_fwip.c,v 1.18 2009/02/09 16:58:18 fjoe Exp $
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fwip.c,v 1.29 2018/11/15 10:23:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fwip.c,v 1.30 2020/01/29 06:19:39 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 #include <net/bpf.h>
 #include <net/if.h>
 #include <net/if_ieee1394.h>
 @@ -260,27 +260,27 @@ fwip_start(struct ifnet *ifp)
 	struct fwip_softc *sc = ((struct fwip_eth_softc *)ifp->if_softc)->fwip;
 	FWIPDEBUG(ifp, "starting\n");
 	if (sc->sc_dma_ch < 0) {
 		struct mbuf *m = NULL;
 		FWIPDEBUG(ifp, "not ready\n");
 		do {
 			IF_DEQUEUE(&ifp->if_snd, m);
 			if (m != NULL)
 				m_freem(m);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 		} while (m != NULL);
 		return;
+	}
 	ifp->if_flags |= IFF_OACTIVE;
 	if (ifp->if_snd.ifq_len != 0)
 		fwip_async_output(sc, ifp);
 	ifp->if_flags &= ~IFF_OACTIVE;
+}
 @@ -501,27 +501,27 @@ fwip_post_busreset(void *arg)
 	ieee1394_drain(sc->sc_eth.fwip_ifp);
+}
 static void
 fwip_output_callback(struct fw_xfer *xfer)
+{
 	struct fwip_softc *sc = (struct fwip_softc *)xfer->sc;
 	struct ifnet *ifp;
 	ifp = sc->sc_eth.fwip_ifp;
 	/* XXX error check */
 	FWIPDEBUG(ifp, "resp = %d\n", xfer->resp);
 	if (xfer->resp != 0)
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 	m_freem(xfer->mbuf);
 	fw_xfer_unload(xfer);
 	mutex_enter(&sc->sc_mtx);
 	STAILQ_INSERT_TAIL(&sc->sc_xferlist, xfer, link);
 	mutex_exit(&sc->sc_mtx);
 	/* for queue full */
 	if (ifp->if_snd.ifq_head != NULL)
 		fwip_start(ifp);
+}
 @@ -615,27 +615,27 @@ fwip_async_output(struct fwip_softc *sc,
 			 * address is stored in network byte order to
 			 * make life easier for ARP.
 			 */
 			struct fw_device *fd;
 			struct fw_eui64 eui;
 			eui.hi = ntohl(destfw->sender_unique_ID_hi);
 			eui.lo = ntohl(destfw->sender_unique_ID_lo);
 			if (sc->sc_last_dest.hi != eui.hi ||
 			    sc->sc_last_dest.lo != eui.lo) {
 				fd = fw_noderesolve_eui64(fc, &eui);
 				if (!fd) {
 					/* error */
-					ifp->if_oerrors++;
+					if_statinc(ifp, if_oerrors);
 					/* XXX set error code */
 					fwip_output_callback(xfer);
 					continue;
+				}
 				sc->sc_last_hdr.mode.wreqb.dst =
 				    FWLOCALBUS | fd->dst;
 				sc->sc_last_hdr.mode.wreqb.tlrt = 0;
 				sc->sc_last_hdr.mode.wreqb.tcode =
 				    FWTCODE_WREQB;
 				sc->sc_last_hdr.mode.wreqb.pri = 0;
 				sc->sc_last_hdr.mode.wreqb.src = nodeid;
 				sc->sc_last_hdr.mode.wreqb.dest_hi =
 @@ -658,32 +658,32 @@ fwip_async_output(struct fwip_softc *sc,
 			/*
 			 * We ran out of tlabels - requeue the packet
 			 * for later transmission.
 			 */
 			xfer->mbuf = 0;
 			mutex_enter(&sc->sc_mtx);
 			STAILQ_INSERT_TAIL(&sc->sc_xferlist, xfer, link);
 			mutex_exit(&sc->sc_mtx);
 			IF_PREPEND(&ifp->if_snd, m);
 			break;
+		}
 		if (error) {
 			/* error */
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			/* XXX set error code */
 			fwip_output_callback(xfer);
 			continue;
 		} else {
-			ifp->if_opackets++;
+			if_statinc(ifp, if_opackets);
 			i++;
+		}
+	}
 #if 0
 	if (i > 1)
 		aprint_normal("%d queued\n", i);
 #endif
 	if (i > 0)
 		xferq->start(fc);
+}
 /* Async. stream output */
 static void
 @@ -716,54 +716,54 @@ fwip_stream_input(struct fw_xferq *xferq
 			aprint_error_ifnet(ifp,
 			    "fwip_as_input: m_getcl failed\n");
 		/*
 		 * We must have a GASP header - leave the
 		 * encapsulation sanity checks to the generic
 		 * code. Remeber that we also have the firewire async
 		 * stream header even though that isn't accounted for
 		 * in mode.stream.len.
 		 */
 		if (sxfer->resp != 0 ||
 		    fp->mode.stream.len < 2 * sizeof(uint32_t)) {
 			m_freem(m);
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			continue;
+		}
 		m->m_len = m->m_pkthdr.len = fp->mode.stream.len
 			+ sizeof(fp->mode.stream);
 		/*
 		 * If we received the packet on the broadcast channel,
 		 * mark it as broadcast, otherwise we assume it must
 		 * be multicast.
 		 */
 		if (fp->mode.stream.chtag == broadcast_channel)
 			m->m_flags |= M_BCAST;
 		else
 			m->m_flags |= M_MCAST;
 		/*
 		 * Make sure we recognise the GASP specifier and
 		 * version.
 		 */
 		p = mtod(m, uint32_t *);
 		if ((((ntohl(p[1]) & 0xffff) << 8) | ntohl(p[2]) >> 24) !=
 x00005e ||
 		    (ntohl(p[2]) & 0xffffff) != 1) {
 			FWIPDEBUG(ifp, "Unrecognised GASP header %#08x %#08x\n",
 			    ntohl(p[1]), ntohl(p[2]));
 			m_freem(m);
-			ifp->if_ierrors++;
+			if_statinc(ifp, if_ierrors);
 			continue;
+		}
 		/*
 		 * Record the sender ID for possible BPF usage.
 		 */
 		src = ntohl(p[1]) >> 16;
 		if (ifp->if_bpf) {
 			mtag = m_tag_get(MTAG_FIREWIRE_SENDER_EUID,
 * sizeof(uint32_t), M_NOWAIT);
 			if (mtag) {
 				/* bpf wants it in network byte order */
 				struct fw_device *fd;
 @@ -778,27 +778,27 @@ fwip_stream_input(struct fw_xferq *xferq
 					p2[0] = 0;
 					p2[1] = 0;
+				}
 				m_tag_prepend(m, mtag);
+			}
+		}
 		/*
 		 * Trim off the GASP header
 		 */
 		m_adj(m, 3*sizeof(uint32_t));
 		m_set_rcvif(m, ifp);
 		ieee1394_input(ifp, m, src);
-		ifp->if_ipackets++;
+		if_statinc(ifp, if_ipackets);
+	}
 	if (STAILQ_FIRST(&xferq->stfree) != NULL)
 		sc->sc_fd.fc->irx_enable(sc->sc_fd.fc, sc->sc_dma_ch);
+}
 static inline void
 fwip_unicast_input_recycle(struct fwip_softc *sc, struct fw_xfer *xfer)
+{
 	struct mbuf *m;
 	/*
 	 * We have finished with a unicast xfer. Allocate a new
 	 * cluster and stick it on the back of the input queue.
 @@ -847,27 +847,27 @@ fwip_unicast_input(struct fw_xfer *xfer)
+	}
 	/*
 	 * Pick up a new mbuf and stick it on the back of the receive
 	 * queue.
 	 */
 	fwip_unicast_input_recycle(sc, xfer);
 	/*
 	 * If we've already rejected the packet, give up now.
 	 */
 	if (rtcode != FWRCODE_COMPLETE) {
 		m_freem(m);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	if (ifp->if_bpf) {
 		/*
 		 * Record the sender ID for possible BPF usage.
 		 */
 		mtag = m_tag_get(MTAG_FIREWIRE_SENDER_EUID,
 * sizeof(uint32_t), M_NOWAIT);
 		if (mtag) {
 			/* bpf wants it in network byte order */
 			struct fw_device *fd;
 			uint32_t *p = (uint32_t *) (mtag + 1);
 @@ -883,15 +883,15 @@ fwip_unicast_input(struct fw_xfer *xfer)
+			}
 			m_tag_prepend(m, mtag);
+		}
+	}
 	/*
 	 * Hand off to the generic encapsulation code. We don't use
 	 * ifp->if_input so that we can pass the source nodeid as an
 	 * argument to facilitate link-level fragment reassembly.
 	 */
 	m->m_len = m->m_pkthdr.len = fp->mode.wreqb.len;
 	m_set_rcvif(m, ifp);
 	ieee1394_input(ifp, m, fp->mode.wreqb.src);
-	ifp->if_ipackets++;
+	if_statinc(ifp, if_ipackets);
+}