Module Name: src
Committed By: riastradh
Date: Sat Aug 20 14:08:17 UTC 2022
Modified Files:
src/sys/dev/usb: usbnet.c
Log Message:
usbnet(9): Simplify core lock use in usbnet_tick_task.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 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.104 src/sys/dev/usb/usbnet.c:1.105
--- src/sys/dev/usb/usbnet.c:1.104 Sat Aug 20 14:08:05 2022
+++ src/sys/dev/usb/usbnet.c Sat Aug 20 14:08:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: usbnet.c,v 1.104 2022/08/20 14:08:05 riastradh Exp $ */
+/* $NetBSD: usbnet.c,v 1.105 2022/08/20 14:08:17 riastradh Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.104 2022/08/20 14:08:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.105 2022/08/20 14:08:17 riastradh Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1237,16 +1237,14 @@ usbnet_tick_task(void *arg)
/* Call driver if requested. */
uno_tick(un);
+ mutex_enter(&unp->unp_core_lock);
DPRINTFN(8, "mii %#jx ifp %#jx", (uintptr_t)mii, (uintptr_t)ifp, 0, 0);
if (mii) {
- mutex_enter(&unp->unp_core_lock);
mii_tick(mii);
if (!unp->unp_link)
(*mii->mii_statchg)(ifp);
- mutex_exit(&unp->unp_core_lock);
}
- mutex_enter(&unp->unp_core_lock);
if (!unp->unp_stopped && !usbnet_isdying(un))
callout_schedule(&unp->unp_stat_ch, hz);
mutex_exit(&unp->unp_core_lock);
