CVS commit: src/sys/net

[Jason R Thorpe]

Module Name:    src
Committed By:   thorpej
Date:           Wed Jan 29 04:30:42 UTC 2020

Modified Files:
        src/sys/net/agr: ieee8023ad_lacp.c if_agr.c
        src/sys/net/npf: npf_ext_log.c

Log Message:
Adopt <net/if_stats.h>.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/net/agr/ieee8023ad_lacp.c
cvs rdiff -u -r1.50 -r1.51 src/sys/net/agr/if_agr.c
cvs rdiff -u -r1.15 -r1.16 src/sys/net/npf/npf_ext_log.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/net/agr/ieee8023ad_lacp.c
diff -u src/sys/net/agr/ieee8023ad_lacp.c:1.10 src/sys/net/agr/ieee8023ad_lacp.c:1.11
--- src/sys/net/agr/ieee8023ad_lacp.c:1.10	Fri Jul  1 02:46:24 2011
+++ src/sys/net/agr/ieee8023ad_lacp.c	Wed Jan 29 04:30:41 2020
@@ -1,4 +1,4 @@
-/*	$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,
@@ -27,7 +27,7 @@
  */
 
 #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>
@@ -503,7 +503,7 @@ ieee8023ad_select_tx_port(struct agr_sof
 	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;
 	}
 

Index: src/sys/net/agr/if_agr.c
diff -u src/sys/net/agr/if_agr.c:1.50 src/sys/net/agr/if_agr.c:1.51
--- src/sys/net/agr/if_agr.c:1.50	Sun Oct  6 15:11:17 2019
+++ src/sys/net/agr/if_agr.c	Wed Jan 29 04:30:41 2020
@@ -1,4 +1,4 @@
-/*	$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,
@@ -27,7 +27,7 @@
  */
 
 #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"
@@ -156,7 +156,7 @@ agr_input(struct ifnet *ifp_port, struct
 	ifp = port->port_agrifp;
 	if ((port->port_flags & AGRPORT_COLLECTING) == 0) {
 		m_freem(m);
-		ifp->if_ierrors++;
+		if_statinc(ifp, if_ierrors);
 		return;
 	}
 
@@ -390,19 +390,21 @@ agr_start(struct ifnet *ifp)
 		}
 		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);

Index: src/sys/net/npf/npf_ext_log.c
diff -u src/sys/net/npf/npf_ext_log.c:1.15 src/sys/net/npf/npf_ext_log.c:1.16
--- src/sys/net/npf/npf_ext_log.c:1.15	Sat Sep 29 14:41:36 2018
+++ src/sys/net/npf/npf_ext_log.c	Wed Jan 29 04:30:41 2020
@@ -33,7 +33,7 @@
 
 #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>
@@ -140,8 +140,7 @@ npf_log(npf_cache_t *npc, void *meta, co
 	}
 
 	/* Pass through BPF. */
-	ifp->if_opackets++;
-	ifp->if_obytes += m->m_pkthdr.len;
+	if_statadd2(ifp, if_opackets, 1, if_obytes, m->m_pkthdr.len);
 	if (ifp->if_bpf) {
 		bpf_mtap2(ifp->if_bpf, &hdr, NPFLOG_HDRLEN, m, BPF_D_OUT);
 	}