Date: Mon, 13 Jan 2020 11:27:30 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r356679 - in stable/12/sys: dev/usb sys Message-ID: <202001131127.00DBRU1B055673@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Mon Jan 13 11:27:30 2020 New Revision: 356679 URL: https://svnweb.freebsd.org/changeset/base/356679 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/12/sys/dev/usb/usb_device.h stable/12/sys/dev/usb/usb_transfer.c stable/12/sys/sys/param.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/usb/usb_device.h ============================================================================== --- stable/12/sys/dev/usb/usb_device.h Mon Jan 13 06:55:38 2020 (r356678) +++ stable/12/sys/dev/usb/usb_device.h Mon Jan 13 11:27:30 2020 (r356679) @@ -191,6 +191,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/12/sys/dev/usb/usb_transfer.c ============================================================================== --- stable/12/sys/dev/usb/usb_transfer.c Mon Jan 13 06:55:38 2020 (r356678) +++ stable/12/sys/dev/usb/usb_transfer.c Mon Jan 13 11:27:30 2020 (r356679) @@ -2593,7 +2593,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/12/sys/sys/param.h ============================================================================== --- stable/12/sys/sys/param.h Mon Jan 13 06:55:38 2020 (r356678) +++ stable/12/sys/sys/param.h Mon Jan 13 11:27:30 2020 (r356679) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1201509 /* Master, propagated to newvers */ +#define __FreeBSD_version 1201510 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001131127.00DBRU1B055673>