diff options
| author | riastradh <riastradh@NetBSD.org> | 2022-08-20 14:06:09 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2022-08-20 14:06:09 +0000 |
| commit | 363a74dfd10e3473b5cac37be39bc9ae145b79ab (patch) | |
| tree | 6d5141defa7aa14fb077db02f50a7fe83d8ee9e3 /sys/dev/usb/usbnet.c | |
| parent | fa4835c5cca20f686bb8a6687da249cc7f94b363 (diff) | |
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.
Diffstat (limited to 'sys/dev/usb/usbnet.c')
| -rw-r--r-- | sys/dev/usb/usbnet.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/usbnet.c b/sys/dev/usb/usbnet.c index 300b19a529f..0a5309c98f3 100644 --- a/sys/dev/usb/usbnet.c +++ b/sys/dev/usb/usbnet.c @@ -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, void *priv, usbd_status status) 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; } |
