CVS commit: src/sys/netcan

[Jason R Thorpe]

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

Modified Files:
        src/sys/netcan: can.c if_canloop.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/netcan/can.c src/sys/netcan/if_canloop.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/netcan/can.c
diff -u src/sys/netcan/can.c:1.8 src/sys/netcan/can.c:1.9
--- src/sys/netcan/can.c:1.8	Mon Aug 19 03:24:38 2019
+++ src/sys/netcan/can.c	Wed Jan 29 05:20:26 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: can.c,v 1.8 2019/08/19 03:24:38 ozaki-r Exp $	*/
+/*	$NetBSD: can.c,v 1.9 2020/01/29 05:20:26 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.8 2019/08/19 03:24:38 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.9 2020/01/29 05:20:26 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -249,7 +249,7 @@ can_output(struct mbuf *m, struct canpcb
 		
 	sotag = m_tag_get(PACKET_TAG_SO, sizeof(struct socket *), PR_NOWAIT);
 	if (sotag == NULL) {
-		ifp->if_oerrors++;
+		if_statinc(ifp, if_oerrors);
 		return ENOMEM;
 	}
 	mutex_enter(&canp->canp_mtx);
@@ -307,8 +307,7 @@ can_input(struct ifnet *ifp, struct mbuf
 	} else {
 		IF_ENQUEUE(inq, m);
 		IFQ_UNLOCK(inq);
-		ifp->if_ipackets++;
-		ifp->if_ibytes += m->m_pkthdr.len;
+		if_statadd2(ifp, if_ipackets, 1, if_ibytes, m->m_pkthdr.len);
 		schednetisr(NETISR_CAN);
 	}
 }
Index: src/sys/netcan/if_canloop.c
diff -u src/sys/netcan/if_canloop.c:1.8 src/sys/netcan/if_canloop.c:1.9
--- src/sys/netcan/if_canloop.c:1.8	Sat Apr 27 08:49:19 2019
+++ src/sys/netcan/if_canloop.c	Wed Jan 29 05:20:26 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_canloop.c,v 1.8 2019/04/27 08:49:19 pgoyette Exp $	*/
+/*	$NetBSD: if_canloop.c,v 1.9 2020/01/29 05:20:26 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_canloop.c,v 1.8 2019/04/27 08:49:19 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_canloop.c,v 1.9 2020/01/29 05:20:26 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_can.h"
@@ -170,8 +170,7 @@ canloop_ifstart(struct ifnet *ifp)
 			can_bpf_mtap(ifp, m, 0);
 
 		pktlen = m->m_pkthdr.len;
-		ifp->if_opackets++;
-		ifp->if_obytes += pktlen;
+		if_statadd2(ifp, if_opackets, 1, if_obytes, pktlen);
 
 #ifdef CAN
 		can_mbuf_tag_clean(m);