Module Name: src
Committed By: rin
Date: Wed Feb 6 08:38:41 UTC 2019
Modified Files:
src/sys/dev/usb: if_axen.c if_axenreg.h if_mue.c
Log Message:
Add ratecheck for TX errors for axen(4) and mue(4).
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/usb/if_axen.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/if_axenreg.h
cvs rdiff -u -r1.37 -r1.38 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_axen.c
diff -u src/sys/dev/usb/if_axen.c:1.34 src/sys/dev/usb/if_axen.c:1.35
--- src/sys/dev/usb/if_axen.c:1.34 Wed Feb 6 08:16:49 2019
+++ src/sys/dev/usb/if_axen.c Wed Feb 6 08:38:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axen.c,v 1.34 2019/02/06 08:16:49 rin Exp $ */
+/* $NetBSD: if_axen.c,v 1.35 2019/02/06 08:38:41 rin Exp $ */
/* $OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.34 2019/02/06 08:16:49 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.35 2019/02/06 08:38:41 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1025,10 +1025,9 @@ axen_rxeof(struct usbd_xfer *xfer, void
return; /* XXX plugged out or down */
if (status == USBD_NOT_STARTED || status == USBD_CANCELLED)
return;
- if (usbd_ratecheck(&sc->axen_rx_notice)) {
+ if (usbd_ratecheck(&sc->axen_rx_notice))
aprint_error_dev(sc->axen_dev, "usb errors on rx: %s\n",
usbd_errstr(status));
- }
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(sc->axen_ep[AXEN_ENDPT_RX]);
goto done;
@@ -1217,8 +1216,9 @@ axen_txeof(struct usbd_xfer *xfer, void
return;
}
ifp->if_oerrors++;
- aprint_error_dev(sc->axen_dev, "usb error on tx: %s\n",
- usbd_errstr(status));
+ if (usbd_ratecheck(&sc->axen_tx_notice))
+ aprint_error_dev(sc->axen_dev, "usb error on tx: %s\n",
+ usbd_errstr(status));
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(sc->axen_ep[AXEN_ENDPT_TX]);
splx(s);
Index: src/sys/dev/usb/if_axenreg.h
diff -u src/sys/dev/usb/if_axenreg.h:1.9 src/sys/dev/usb/if_axenreg.h:1.10
--- src/sys/dev/usb/if_axenreg.h:1.9 Wed Feb 6 08:06:59 2019
+++ src/sys/dev/usb/if_axenreg.h Wed Feb 6 08:38:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axenreg.h,v 1.9 2019/02/06 08:06:59 rin Exp $ */
+/* $NetBSD: if_axenreg.h,v 1.10 2019/02/06 08:38:41 rin Exp $ */
/* $OpenBSD: if_axenreg.h,v 1.1 2013/10/07 05:37:41 yuo Exp $ */
/*
@@ -299,6 +299,7 @@ struct axen_softc {
int axen_phyno;
struct timeval axen_rx_notice;
+ struct timeval axen_tx_notice;
u_int axen_rx_bufsz;
u_int axen_tx_bufsz;
int axen_rev;
Index: src/sys/dev/usb/if_mue.c
diff -u src/sys/dev/usb/if_mue.c:1.37 src/sys/dev/usb/if_mue.c:1.38
--- src/sys/dev/usb/if_mue.c:1.37 Wed Feb 6 08:31:38 2019
+++ src/sys/dev/usb/if_mue.c Wed Feb 6 08:38:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mue.c,v 1.37 2019/02/06 08:31:38 rin Exp $ */
+/* $NetBSD: if_mue.c,v 1.38 2019/02/06 08:38:41 rin 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.37 2019/02/06 08:31:38 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.38 2019/02/06 08:38:41 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1634,7 +1634,8 @@ mue_txeof(struct usbd_xfer *xfer, void *
return;
}
ifp->if_oerrors++;
- MUE_PRINTF(sc, "%s\n", usbd_errstr(status));
+ if (usbd_ratecheck(&sc->mue_tx_notice))
+ MUE_PRINTF(sc, "%s\n", usbd_errstr(status));
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(
sc->mue_ep[MUE_ENDPT_TX]);
