 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_hvn.c,v 1.15 2019/12/27 05:59:53 nonaka Exp $	*/
+/*	$NetBSD: if_hvn.c,v 1.16 2020/01/29 05:55:16 thorpej Exp $	*/
 /*	$OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $	*/
 /*-
  * Copyright (c) 2009-2012,2016 Microsoft Corp.
  * Copyright (c) 2010-2012 Citrix Inc.
  * Copyright (c) 2012 NetApp Inc.
  * Copyright (c) 2016 Mike Belopuhov <mike@esdenera.com>
  * 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
 @@ -25,27 +25,27 @@
  * 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.
  */
 /*
  * The OpenBSD port was done under funding by Esdenera Networks GmbH.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.15 2019/12/27 05:59:53 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.16 2020/01/29 05:55:16 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/atomic.h>
 #include <sys/bus.h>
 @@ -488,36 +488,36 @@ hvn_start(struct ifnet *ifp)
 	for (;;) {
 		if (!sc->sc_tx_avail) {
 			/* transient */
 			ifp->if_flags |= IFF_OACTIVE;
 			break;
+		}
 		IFQ_DEQUEUE(&ifp->if_snd, m);
 		if (m == NULL)
 			break;
 		if (hvn_encap(sc, m, &txd)) {
 			/* the chain is too large */
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			m_freem(m);
 			continue;
+		}
 		bpf_mtap(ifp, m, BPF_D_OUT);
 		if (hvn_rndis_output(sc, txd)) {
 			hvn_decap(sc, txd);
-			ifp->if_oerrors++;
+			if_statinc(ifp, if_oerrors);
 			m_freem(m);
 			continue;
+		}
 		sc->sc_tx_next++;
+	}
+}
 static inline char *
 hvn_rndis_pktinfo_append(struct rndis_packet_msg *pkt, size_t pktsize,
     size_t datalen, uint32_t type)
+{
 	struct rndis_pktinfo *pi;
 @@ -668,27 +668,27 @@ hvn_txeof(struct hvn_softc *sc, uint64_t
 	txd = &sc->sc_tx_desc[id];
 	if ((m = txd->txd_buf) == NULL) {
 		device_printf(sc->sc_dev, "no mbuf @%u\n", id);
 		return;
+	}
 	txd->txd_buf = NULL;
 	bus_dmamap_sync(sc->sc_dmat, txd->txd_dmap,
 , txd->txd_dmap->dm_mapsize,
 	    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 	bus_dmamap_unload(sc->sc_dmat, txd->txd_dmap);
 	m_freem(m);
-	ifp->if_opackets++;
+	if_statinc(ifp, if_opackets);
 	txd->txd_ready = 1;
 	atomic_inc_uint(&sc->sc_tx_avail);
 	ifp->if_flags &= ~IFF_OACTIVE;
+}
 static int
 hvn_rx_ring_create(struct hvn_softc *sc)
+{
 	struct hvn_nvs_rxbuf_conn cmd;
 	struct hvn_nvs_rxbuf_conn_resp *rsp;
 	uint64_t tid;
 @@ -1550,27 +1550,27 @@ hvn_rxeof(struct hvn_softc *sc, uint8_t
 		return;
+	}
 	pkt = (struct rndis_packet_msg *)buf;
 	if (pkt->rm_dataoffset + pkt->rm_datalen > len) {
 		device_printf(sc->sc_dev,
 		    "data packet out of bounds: %u@%u\n", pkt->rm_dataoffset,
 		    pkt->rm_datalen);
 		return;
+	}
 	if ((m = hvn_devget(sc, buf + RNDIS_HEADER_OFFSET + pkt->rm_dataoffset,
 	    pkt->rm_datalen)) == NULL) {
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	if (pkt->rm_pktinfooffset + pkt->rm_pktinfolen > len) {
 		device_printf(sc->sc_dev,
 		    "pktinfo is out of bounds: %u@%u vs %u\n",
 		    pkt->rm_pktinfolen, pkt->rm_pktinfooffset, len);
 		goto done;
+	}
 	pi = (struct rndis_pktinfo *)(buf + RNDIS_HEADER_OFFSET +
 	    pkt->rm_pktinfooffset);
 	while (pkt->rm_pktinfolen > 0) {