 @@ -1,14 +1,14 @@
-/*	$NetBSD: ieee8023ad_lacp.c,v 1.10 2011/07/01 02:46:24 joerg Exp $	*/
+/*	$NetBSD: ieee8023ad_lacp.c,v 1.11 2020/01/29 04:30:41 thorpej Exp $	*/
 /*-
  * Copyright (c)2005 YAMAMOTO Takashi,
  * 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.
 @@ -17,27 +17,27 @@
  * 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 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp.c,v 1.10 2011/07/01 02:46:24 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp.c,v 1.11 2020/01/29 04:30:41 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h> /* hz */
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
 @@ -493,27 +493,27 @@ ieee8023ad_dtor(struct agr_softc *sc)
 struct agr_port *
 ieee8023ad_select_tx_port(struct agr_softc *sc, struct mbuf *m)
+{
 	const struct lacp_softc *lsc = LACP_SOFTC(sc);
 	const struct lacp_aggregator *la;
 	const struct lacp_port *lp;
 	uint32_t hash;
 	int nports;
 	if (__predict_false(lsc->lsc_suppress_distributing &&
 	    !AGR_ROUNDROBIN(sc))) {
 		LACP_DPRINTF((NULL, "%s: waiting transit\n", __func__));
-		sc->sc_if.if_collisions++; /* XXX abuse */
+		if_statinc(&sc->sc_if, if_collisions);	/* XXX abuse */
 		return NULL;
+	}
 	la = lsc->lsc_active_aggregator;
 	if (__predict_false(la == NULL)) {
 		LACP_DPRINTF((NULL, "%s: no active aggregator\n", __func__));
 		return NULL;
+	}
 	nports = la->la_nports;
 	KASSERT(nports > 0);
 	if (AGR_ROUNDROBIN(sc)) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_agr.c,v 1.50 2019/10/06 15:11:17 uwe Exp $	*/
+/*	$NetBSD: if_agr.c,v 1.51 2020/01/29 04:30:41 thorpej Exp $	*/
 /*-
  * Copyright (c)2005 YAMAMOTO Takashi,
  * 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.
 @@ -17,27 +17,27 @@
  * 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 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.50 2019/10/06 15:11:17 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.51 2020/01/29 04:30:41 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/callout.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/sockio.h>
 @@ -146,27 +146,27 @@ agrdetach(void)
 void
 agr_input(struct ifnet *ifp_port, struct mbuf *m)
+{
 	struct ethercom *ec = (struct ethercom *)ifp_port;
 	struct agr_port *port;
 	struct ifnet *ifp;
 	port = ifp_port->if_agrprivate;
 	KASSERT(port);
 	ifp = port->port_agrifp;
 	if ((port->port_flags & AGRPORT_COLLECTING) == 0) {
 		m_freem(m);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	m_set_rcvif(m, ifp);
 	/*
 	 * If VLANs are configured on the interface, check to
 	 * see if the device performed the decapsulation and
 	 * provided us with the tag.
 	 */
 	if (ec->ec_nvlans && vlan_has_tag(m)) {
 		MODULE_HOOK_CALL_VOID(if_vlan_vlan_input_hook, (ifp, m),
 		    m_freem(m));
 @@ -380,39 +380,41 @@ agr_start(struct ifnet *ifp)
 	struct mbuf *m;
 	AGR_LOCK(sc);
 	while (/* CONSTCOND */ 1) {
 		struct agr_port *port;
 		IFQ_DEQUEUE(&ifp->if_snd, m);
 		if (m == NULL) {
 			break;
+		}
 		bpf_mtap(ifp, m, BPF_D_OUT);
 		port = agr_select_tx_port(sc, m);
 		net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 		if (port) {
 			int error;
 			error = agr_xmit_frame(port->port_ifp, m);
 			if (error) {
-				ifp->if_oerrors++;
+				if_statinc_ref(nsr, if_oerrors);
 			} else {
-				ifp->if_opackets++;
+				if_statinc_ref(nsr, if_opackets);
+			}
 		} else {
 			m_freem(m);
-			ifp->if_oerrors++;
+			if_statinc_ref(nsr, if_oerrors);
+		}
 		IF_STAT_PUTREF(ifp);
+	}
 	AGR_UNLOCK(sc);
 	ifp->if_flags &= ~IFF_OACTIVE;
+}
 static int
 agr_setconfig(struct agr_softc *sc, const struct agrreq *ar)
+{
 	struct ifnet *ifp = &sc->sc_if;
 	int cmd = ar->ar_cmd;
 	struct ifnet *ifp_port;

 @@ -23,27 +23,27 @@
  * 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.
  */
 /*
  * NPF logging extension.
  */
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ext_log.c,v 1.15 2018/09/29 14:41:36 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ext_log.c,v 1.16 2020/01/29 04:30:41 thorpej Exp $");
 #include <sys/types.h>
 #include <sys/module.h>
 #include <sys/conf.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/queue.h>
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/bpf.h>
 @@ -130,28 +130,27 @@ npf_log(npf_cache_t *npc, void *meta, co
+	}
 	KERNEL_LOCK(1, NULL);
 	/* Find a pseudo-interface to log. */
 	ifp = if_get_byindex(log->if_idx, &psref);
 	if (ifp == NULL) {
 		/* No interface. */
 		KERNEL_UNLOCK_ONE(NULL);
 		return true;
+	}
 	/* Pass through BPF. */
-	ifp->if_opackets++;
+	if_statadd2(ifp, if_opackets, 1, if_obytes, m->m_pkthdr.len);
 	ifp->if_obytes += m->m_pkthdr.len;
 	if (ifp->if_bpf) {
 		bpf_mtap2(ifp->if_bpf, &hdr, NPFLOG_HDRLEN, m, BPF_D_OUT);
+	}
 	if_put(ifp, &psref);
 	KERNEL_UNLOCK_ONE(NULL);
 	return true;
+}
 /*
  * Module interface.
  */