Module Name: src
Committed By: riastradh
Date: Sat Aug 20 14:06:09 UTC 2022
Modified Files:
src/sys/dev/usb: usbnet.c
Log Message:
usbnet(9): Don't touch unp_stopping in usbnet_pipe_intr.
This access was unprotected by a lock, but it's not necessary anyway:
usbnet_stop aborts the pipes, and the xfer doesn't call usbd_transfer
to reschedule itself -- it's an intr pipe, so it's rescheduled
internally by usbdi(9) in a way that usbd_abort_pipe atomically
prevents.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/usb/usbnet.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/usbnet.c
diff -u src/sys/dev/usb/usbnet.c:1.100 src/sys/dev/usb/usbnet.c:1.101
--- src/sys/dev/usb/usbnet.c:1.100 Sat Aug 20 14:05:58 2022
+++ src/sys/dev/usb/usbnet.c Sat Aug 20 14:06:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: usbnet.c,v 1.100 2022/08/20 14:05:58 riastradh Exp $ */
+/* $NetBSD: usbnet.c,v 1.101 2022/08/20 14:06:09 riastradh Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.100 2022/08/20 14:05:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.101 2022/08/20 14:06:09 riastradh Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -460,12 +460,12 @@ usbnet_pipe_intr(struct usbd_xfer *xfer,
struct usbnet_private * const unp = un->un_pri;
struct usbnet_intr * const uni __unused = un->un_intr;
- if (usbnet_isdying(un) || unp->unp_stopping ||
+ if (usbnet_isdying(un) ||
status == USBD_INVAL || status == USBD_NOT_STARTED ||
status == USBD_CANCELLED) {
- USBNETHIST_CALLARGS("%jd: uni %#jx d/s %#jx status %#jx",
+ USBNETHIST_CALLARGS("%jd: uni %#jx dying %#jx status %#jx",
unp->unp_number, (uintptr_t)uni,
- (usbnet_isdying(un) << 8) | unp->unp_stopping, status);
+ usbnet_isdying(un), status);
return;
}
