Module Name: src
Committed By: thorpej
Date: Wed Jan 29 06:26:32 UTC 2020
Modified Files:
src/sys/dev/usb: if_bwfm_usb.c if_cdce.c if_cue.c if_kue.c if_mos.c
if_mue.c
Log Message:
Adopt <net/if_stats.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/if_bwfm_usb.c
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/usb/if_cdce.c
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/usb/if_cue.c
cvs rdiff -u -r1.101 -r1.102 src/sys/dev/usb/if_kue.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/if_mos.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/usb/if_mue.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/dev/usb/if_bwfm_usb.c
diff -u src/sys/dev/usb/if_bwfm_usb.c:1.9 src/sys/dev/usb/if_bwfm_usb.c:1.10
--- src/sys/dev/usb/if_bwfm_usb.c:1.9 Sun Jan 27 02:08:42 2019
+++ src/sys/dev/usb/if_bwfm_usb.c Wed Jan 29 06:26:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bwfm_usb.c,v 1.9 2019/01/27 02:08:42 pgoyette Exp $ */
+/* $NetBSD: if_bwfm_usb.c,v 1.10 2020/01/29 06:26:32 thorpej Exp $ */
/* $OpenBSD: if_bwfm_usb.c,v 1.2 2017/10/15 14:55:13 patrick Exp $ */
/*
* Copyright (c) 2010-2016 Broadcom Corporation
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bwfm_usb.c,v 1.9 2019/01/27 02:08:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bwfm_usb.c,v 1.10 2020/01/29 06:26:32 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -617,12 +617,12 @@ bwfm_usb_txeof(struct usbd_xfer *xfer, v
if (__predict_false(status != USBD_NORMAL_COMPLETION)) {
if (status == USBD_CANCELLED)
usbd_clear_endpoint_stall_async(sc->sc_tx_pipeh);
- ifp->if_oerrors++;
+ if_statinc(ifp, if_oerrors);
splx(s);
return;
}
- ifp->if_opackets++;
+ if_statinc(ifp, if_opackets);
/* We just released a Tx buffer, notify Tx. */
if ((ifp->if_flags & IFF_OACTIVE) != 0) {
Index: src/sys/dev/usb/if_cdce.c
diff -u src/sys/dev/usb/if_cdce.c:1.68 src/sys/dev/usb/if_cdce.c:1.69
--- src/sys/dev/usb/if_cdce.c:1.68 Tue Jan 7 06:42:26 2020
+++ src/sys/dev/usb/if_cdce.c Wed Jan 29 06:26:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.68 2020/01/07 06:42:26 maxv Exp $ */
+/* $NetBSD: if_cdce.c,v 1.69 2020/01/29 06:26:32 thorpej Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wp...@windriver.com>
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.68 2020/01/07 06:42:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.69 2020/01/29 06:26:32 thorpej Exp $");
#include <sys/param.h>
@@ -282,7 +282,7 @@ cdce_rx_loop(struct usbnet * un, struct
total_len -= 4;
if (total_len < sizeof(struct ether_header)) {
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
return;
}
Index: src/sys/dev/usb/if_cue.c
diff -u src/sys/dev/usb/if_cue.c:1.88 src/sys/dev/usb/if_cue.c:1.89
--- src/sys/dev/usb/if_cue.c:1.88 Tue Jan 7 06:42:26 2020
+++ src/sys/dev/usb/if_cue.c Wed Jan 29 06:26:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cue.c,v 1.88 2020/01/07 06:42:26 maxv Exp $ */
+/* $NetBSD: if_cue.c,v 1.89 2020/01/29 06:26:32 thorpej Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.88 2020/01/07 06:42:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.89 2020/01/29 06:26:32 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -545,12 +545,17 @@ cue_tick(struct usbnet *un)
{
struct ifnet *ifp = usbnet_ifp(un);
+ net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
if (cue_csr_read_2(un, CUE_RX_FRAMEERR))
- ifp->if_ierrors++;
+ if_statinc_ref(nsr, if_ierrors);
- ifp->if_collisions += cue_csr_read_2(un, CUE_TX_SINGLECOLL);
- ifp->if_collisions += cue_csr_read_2(un, CUE_TX_MULTICOLL);
- ifp->if_collisions += cue_csr_read_2(un, CUE_TX_EXCESSCOLL);
+ if_statadd_ref(nsr, if_collisions,
+ cue_csr_read_2(un, CUE_TX_SINGLECOLL));
+ if_statadd_ref(nsr, if_collisions,
+ cue_csr_read_2(un, CUE_TX_MULTICOLL));
+ if_statadd_ref(nsr, if_collisions,
+ cue_csr_read_2(un, CUE_TX_EXCESSCOLL));
+ IF_STAT_PUTREF(ifp);
}
static void
@@ -568,7 +573,7 @@ cue_rx_loop(struct usbnet *un, struct us
if (total_len < 2 ||
len > total_len - 2 ||
len < sizeof(struct ether_header)) {
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
return;
}
Index: src/sys/dev/usb/if_kue.c
diff -u src/sys/dev/usb/if_kue.c:1.101 src/sys/dev/usb/if_kue.c:1.102
--- src/sys/dev/usb/if_kue.c:1.101 Tue Jan 7 06:42:26 2020
+++ src/sys/dev/usb/if_kue.c Wed Jan 29 06:26:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.101 2020/01/07 06:42:26 maxv Exp $ */
+/* $NetBSD: if_kue.c,v 1.102 2020/01/29 06:26:32 thorpej Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.101 2020/01/07 06:42:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.102 2020/01/29 06:26:32 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -551,7 +551,7 @@ kue_rx_loop(struct usbnet *un, struct us
if (pktlen < ETHER_MIN_LEN - ETHER_CRC_LEN ||
pktlen > MCLBYTES - ETHER_ALIGN) {
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
return;
}
Index: src/sys/dev/usb/if_mos.c
diff -u src/sys/dev/usb/if_mos.c:1.3 src/sys/dev/usb/if_mos.c:1.4
--- src/sys/dev/usb/if_mos.c:1.3 Tue Jan 7 06:42:26 2020
+++ src/sys/dev/usb/if_mos.c Wed Jan 29 06:26:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mos.c,v 1.3 2020/01/07 06:42:26 maxv Exp $ */
+/* $NetBSD: if_mos.c,v 1.4 2020/01/29 06:26:32 thorpej Exp $ */
/* $OpenBSD: if_mos.c,v 1.40 2019/07/07 06:40:10 kevlo Exp $ */
/*
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mos.c,v 1.3 2020/01/07 06:42:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mos.c,v 1.4 2020/01/29 06:26:32 thorpej Exp $");
#include <sys/param.h>
@@ -685,7 +685,7 @@ mos_rx_loop(struct usbnet * un, struct u
/* evaluate status byte at the end */
pktlen = total_len - 1;
if (pktlen > un->un_rx_bufsz) {
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
return;
}
rxstat = buf[pktlen] & MOS_RXSTS_MASK;
@@ -701,12 +701,12 @@ mos_rx_loop(struct usbnet * un, struct u
DPRINTF(("CRC error\n"));
if (rxstat & MOS_RXSTS_ALIGN_ERROR)
DPRINTF(("alignment error\n"));
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
return;
}
if (pktlen < sizeof(struct ether_header) ) {
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
return;
}
Index: src/sys/dev/usb/if_mue.c
diff -u src/sys/dev/usb/if_mue.c:1.56 src/sys/dev/usb/if_mue.c:1.57
--- src/sys/dev/usb/if_mue.c:1.56 Tue Jan 7 06:42:26 2020
+++ src/sys/dev/usb/if_mue.c Wed Jan 29 06:26:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mue.c,v 1.56 2020/01/07 06:42:26 maxv Exp $ */
+/* $NetBSD: if_mue.c,v 1.57 2020/01/29 06:26:32 thorpej Exp $ */
/* $OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $ */
/*
@@ -20,7 +20,7 @@
/* Driver for Microchip LAN7500/LAN7800 chipsets. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.56 2020/01/07 06:42:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.57 2020/01/29 06:26:32 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1153,7 +1153,7 @@ mue_rx_loop(struct usbnet *un, struct us
do {
if (__predict_false(total_len < sizeof(*hdrp))) {
MUE_PRINTF(un, "packet length %u too short\n", total_len);
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
return;
}
@@ -1167,7 +1167,7 @@ mue_rx_loop(struct usbnet *un, struct us
* checksum errors which we handle below.
*/
MUE_PRINTF(un, "rx_cmd_a: 0x%x\n", rx_cmd_a);
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
return;
}
@@ -1179,7 +1179,7 @@ mue_rx_loop(struct usbnet *un, struct us
pktlen > MCLBYTES - ETHER_ALIGN || /* XXX */
pktlen + sizeof(*hdrp) > total_len)) {
MUE_PRINTF(un, "invalid packet length %d\n", pktlen);
- ifp->if_ierrors++;
+ if_statinc(ifp, if_ierrors);
return;
}
