Author: hselasky
Date: Mon Jan 13 11:33:03 2020
New Revision: 356681
URL: https://svnweb.freebsd.org/changeset/base/356681
Log:
MFC r356409:
Add own counter for cancelled USB transfers.
Do not count these as errors.
Bump the FreeBSD version to force recompilation of external modules.
Sponsored by: Mellanox Technologies
Modified:
stable/10/sys/dev/usb/usb_device.h
stable/10/sys/dev/usb/usb_transfer.c
stable/10/sys/sys/param.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/usb/usb_device.h
==============================================================================
--- stable/10/sys/dev/usb/usb_device.h Mon Jan 13 11:30:07 2020
(r356680)
+++ stable/10/sys/dev/usb/usb_device.h Mon Jan 13 11:33:03 2020
(r356681)
@@ -189,6 +189,7 @@ struct usb_device {
/* statistics */
struct usb_device_statistics stats_err;
struct usb_device_statistics stats_ok;
+ struct usb_device_statistics stats_cancelled;
/* generic clear stall message */
struct usb_udev_msg cs_msg[2];
Modified: stable/10/sys/dev/usb/usb_transfer.c
==============================================================================
--- stable/10/sys/dev/usb/usb_transfer.c Mon Jan 13 11:30:07 2020
(r356680)
+++ stable/10/sys/dev/usb/usb_transfer.c Mon Jan 13 11:33:03 2020
(r356681)
@@ -2592,7 +2592,10 @@ usbd_transfer_done(struct usb_xfer *xfer, usb_error_t
}
#endif
/* keep some statistics */
- if (xfer->error) {
+ if (xfer->error == USB_ERR_CANCELLED) {
+ info->udev->stats_cancelled.uds_requests
+ [xfer->endpoint->edesc->bmAttributes & UE_XFERTYPE]++;
+ } else if (xfer->error != USB_ERR_NORMAL_COMPLETION) {
info->udev->stats_err.uds_requests
[xfer->endpoint->edesc->bmAttributes & UE_XFERTYPE]++;
} else {
Modified: stable/10/sys/sys/param.h
==============================================================================
--- stable/10/sys/sys/param.h Mon Jan 13 11:30:07 2020 (r356680)
+++ stable/10/sys/sys/param.h Mon Jan 13 11:33:03 2020 (r356681)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1004502 /* Master, propagated to newvers */
+#define __FreeBSD_version 1004503 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
