CVS commit: src/sys/dist/pf/net

[Jason R Thorpe]

Module Name:    src
Committed By:   thorpej
Date:           Wed Jan 29 05:52:27 UTC 2020

Modified Files:
        src/sys/dist/pf/net: if_pflog.c if_pfsync.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dist/pf/net/if_pflog.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dist/pf/net/if_pfsync.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/dist/pf/net/if_pflog.c
diff -u src/sys/dist/pf/net/if_pflog.c:1.21 src/sys/dist/pf/net/if_pflog.c:1.22
--- src/sys/dist/pf/net/if_pflog.c:1.21	Tue Jun 26 06:48:02 2018
+++ src/sys/dist/pf/net/if_pflog.c	Wed Jan 29 05:52:27 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_pflog.c,v 1.21 2018/06/26 06:48:02 msaitoh Exp $	*/
+/*	$NetBSD: if_pflog.c,v 1.22 2020/01/29 05:52:27 thorpej Exp $	*/
 /*	$OpenBSD: if_pflog.c,v 1.24 2007/05/26 17:13:30 jason Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pflog.c,v 1.21 2018/06/26 06:48:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pflog.c,v 1.22 2020/01/29 05:52:27 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -294,8 +294,12 @@ pflog_packet(struct pfi_kif *kif, struct
 	}
 #endif /* INET */
 
+#ifdef __NetBSD__
+	if_statadd2(ifn, if_opackets, 1, if_obytes, m->m_pkthdr.len);
+#else
 	ifn->if_opackets++;
 	ifn->if_obytes += m->m_pkthdr.len;
+#endif /* __NetBSD__ */
 
 #ifdef __NetBSD__
 	bpf_mtap2(ifn->if_bpf, &hdr, PFLOG_HDRLEN, m, BPF_D_OUT);

Index: src/sys/dist/pf/net/if_pfsync.c
diff -u src/sys/dist/pf/net/if_pfsync.c:1.19 src/sys/dist/pf/net/if_pfsync.c:1.20
--- src/sys/dist/pf/net/if_pfsync.c:1.19	Sat Dec 22 14:28:56 2018
+++ src/sys/dist/pf/net/if_pfsync.c	Wed Jan 29 05:52:27 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_pfsync.c,v 1.19 2018/12/22 14:28:56 maxv Exp $	*/
+/*	$NetBSD: if_pfsync.c,v 1.20 2020/01/29 05:52:27 thorpej Exp $	*/
 /*	$OpenBSD: if_pfsync.c,v 1.83 2007/06/26 14:44:12 mcbride Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.19 2018/12/22 14:28:56 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.20 2020/01/29 05:52:27 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1045,7 +1045,11 @@ pfsync_get_mbuf(struct pfsync_softc *sc,
 
 	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == NULL) {
+#ifdef __NetBSD__
+		if_statinc(&sc->sc_if, if_oerrors);
+#else
 		sc->sc_if.if_oerrors++;
+#endif /* __NetBSD__ */
 		return (NULL);
 	}
 
@@ -1084,7 +1088,11 @@ pfsync_get_mbuf(struct pfsync_softc *sc,
 		MCLGET(m, M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
+#ifdef __NetBSD__
+			if_statinc(&sc->sc_if, if_oerrors);
+#else
 			sc->sc_if.if_oerrors++;
+#endif /* __NetBSD__ */
 			return (NULL);
 		}
 		m->m_data += (MCLBYTES - len) &~ (sizeof(long) - 1);