Module Name: src
Committed By: riastradh
Date: Thu Mar 3 05:49:00 UTC 2022
Modified Files:
src/sys/dev/usb: usbnet.c
Log Message:
usbnet: Make detach order reverse attach order, for unp_stat_ch.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 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.60 src/sys/dev/usb/usbnet.c:1.61
--- src/sys/dev/usb/usbnet.c:1.60 Thu Mar 3 05:48:52 2022
+++ src/sys/dev/usb/usbnet.c Thu Mar 3 05:49:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: usbnet.c,v 1.60 2022/03/03 05:48:52 riastradh Exp $ */
+/* $NetBSD: usbnet.c,v 1.61 2022/03/03 05:49:00 riastradh Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.60 2022/03/03 05:48:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.61 2022/03/03 05:49:00 riastradh Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1669,7 +1669,6 @@ usbnet_detach(device_t self, int flags)
usbnet_rx_list_free(un);
usbnet_tx_list_free(un);
- callout_destroy(&unp->unp_stat_ch);
rnd_detach_source(&unp->unp_rndsrc);
cv_destroy(&unp->unp_detachcv);
@@ -1677,6 +1676,8 @@ usbnet_detach(device_t self, int flags)
mutex_destroy(&unp->unp_rxlock);
mutex_destroy(&unp->unp_txlock);
+ callout_destroy(&unp->unp_stat_ch);
+
pmf_device_deregister(un->un_dev);
usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, un->un_udev, un->un_dev);
