Module Name: src
Committed By: skrll
Date: Wed Dec 28 09:45:16 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: if_aue.c if_axen.c if_cdce.c if_cue.c
if_smsc.c if_udav.c if_urndis.c
Log Message:
Destroy all mutexes on detach
To generate a diff of this commit:
cvs rdiff -u -r1.132.4.15 -r1.132.4.16 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.3.6.13 -r1.3.6.14 src/sys/dev/usb/if_axen.c
cvs rdiff -u -r1.38.14.10 -r1.38.14.11 src/sys/dev/usb/if_cdce.c
cvs rdiff -u -r1.68.4.13 -r1.68.4.14 src/sys/dev/usb/if_cue.c
cvs rdiff -u -r1.22.2.17 -r1.22.2.18 src/sys/dev/usb/if_smsc.c
cvs rdiff -u -r1.43.4.12 -r1.43.4.13 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.9.4.12 -r1.9.4.13 src/sys/dev/usb/if_urndis.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/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.132.4.15 src/sys/dev/usb/if_aue.c:1.132.4.16
--- src/sys/dev/usb/if_aue.c:1.132.4.15 Mon Dec 12 13:17:56 2016
+++ src/sys/dev/usb/if_aue.c Wed Dec 28 09:45:16 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.132.4.15 2016/12/12 13:17:56 skrll Exp $ */
+/* $NetBSD: if_aue.c,v 1.132.4.16 2016/12/28 09:45:16 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.132.4.15 2016/12/12 13:17:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.132.4.16 2016/12/28 09:45:16 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -933,6 +933,9 @@ aue_detach(device_t self, int flags)
usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->aue_udev, sc->aue_dev);
mutex_destroy(&sc->aue_mii_lock);
+ mutex_destroy(&sc->aue_lock);
+ mutex_destroy(&sc->aue_txlock);
+ mutex_destroy(&sc->aue_rxlock);
#if 0
mutex_destroy(&sc->wkmtx);
#endif
Index: src/sys/dev/usb/if_axen.c
diff -u src/sys/dev/usb/if_axen.c:1.3.6.13 src/sys/dev/usb/if_axen.c:1.3.6.14
--- src/sys/dev/usb/if_axen.c:1.3.6.13 Mon Dec 12 13:15:39 2016
+++ src/sys/dev/usb/if_axen.c Wed Dec 28 09:45:16 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axen.c,v 1.3.6.13 2016/12/12 13:15:39 skrll Exp $ */
+/* $NetBSD: if_axen.c,v 1.3.6.14 2016/12/28 09:45:16 skrll Exp $ */
/* $OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.3.6.13 2016/12/12 13:15:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.3.6.14 2016/12/28 09:45:16 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -874,6 +874,10 @@ axen_detach(device_t self, int flags)
rw_destroy(&sc->axen_mii_lock);
+ mutex_destroy(&sc->axen_txlock);
+ mutex_destroy(&sc->axen_rxlock);
+ mutex_destroy(&sc->axen_lock);
+
return 0;
}
Index: src/sys/dev/usb/if_cdce.c
diff -u src/sys/dev/usb/if_cdce.c:1.38.14.10 src/sys/dev/usb/if_cdce.c:1.38.14.11
--- src/sys/dev/usb/if_cdce.c:1.38.14.10 Mon Dec 12 13:15:39 2016
+++ src/sys/dev/usb/if_cdce.c Wed Dec 28 09:45:16 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.38.14.10 2016/12/12 13:15:39 skrll Exp $ */
+/* $NetBSD: if_cdce.c,v 1.38.14.11 2016/12/28 09:45:16 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wp...@windriver.com>
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.38.14.10 2016/12/12 13:15:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.38.14.11 2016/12/28 09:45:16 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -332,6 +332,10 @@ cdce_detach(device_t self, int flags)
if_detach(ifp);
+ mutex_destroy(&sc->cdce_rxlock);
+ mutex_destroy(&sc->cdce_txlock);
+ mutex_destroy(&sc->cdce_lock);
+
sc->cdce_attached = 0;
splx(s);
Index: src/sys/dev/usb/if_cue.c
diff -u src/sys/dev/usb/if_cue.c:1.68.4.13 src/sys/dev/usb/if_cue.c:1.68.4.14
--- src/sys/dev/usb/if_cue.c:1.68.4.13 Mon Dec 12 13:15:39 2016
+++ src/sys/dev/usb/if_cue.c Wed Dec 28 09:45:16 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cue.c,v 1.68.4.13 2016/12/12 13:15:39 skrll Exp $ */
+/* $NetBSD: if_cue.c,v 1.68.4.14 2016/12/28 09:45:16 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.68.4.13 2016/12/12 13:15:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.68.4.14 2016/12/28 09:45:16 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -613,6 +613,10 @@ cue_detach(device_t self, int flags)
aprint_debug_dev(self, "detach has active endpoints\n");
#endif
+ mutex_destroy(&sc->cue_rxlock);
+ mutex_destroy(&sc->cue_txlock);
+ mutex_destroy(&sc->cue_lock);
+
sc->cue_attached = 0;
splx(s);
Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.22.2.17 src/sys/dev/usb/if_smsc.c:1.22.2.18
--- src/sys/dev/usb/if_smsc.c:1.22.2.17 Wed Dec 28 07:44:26 2016
+++ src/sys/dev/usb/if_smsc.c Wed Dec 28 09:45:16 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.22.2.17 2016/12/28 07:44:26 skrll Exp $ */
+/* $NetBSD: if_smsc.c,v 1.22.2.18 2016/12/28 09:45:16 skrll Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -1224,6 +1224,10 @@ smsc_detach(device_t self, int flags)
mutex_destroy(&sc->sc_mii_lock);
+ mutex_destroy(&sc->sc_rxlock);
+ mutex_destroy(&sc->sc_txlock);
+ mutex_destroy(&sc->sc_lock);
+
return 0;
}
Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.43.4.12 src/sys/dev/usb/if_udav.c:1.43.4.13
--- src/sys/dev/usb/if_udav.c:1.43.4.12 Mon Dec 12 13:15:39 2016
+++ src/sys/dev/usb/if_udav.c Wed Dec 28 09:45:16 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udav.c,v 1.43.4.12 2016/12/12 13:15:39 skrll Exp $ */
+/* $NetBSD: if_udav.c,v 1.43.4.13 2016/12/28 09:45:16 skrll Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.43.4.12 2016/12/12 13:15:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.43.4.13 2016/12/28 09:45:16 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -396,6 +396,10 @@ udav_detach(device_t self, int flags)
mutex_destroy(&sc->sc_mii_lock);
+ mutex_destroy(&sc->sc_txlock);
+ mutex_destroy(&sc->sc_rxlock);
+ mutex_destroy(&sc->sc_lock);
+
return 0;
}
Index: src/sys/dev/usb/if_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.9.4.12 src/sys/dev/usb/if_urndis.c:1.9.4.13
--- src/sys/dev/usb/if_urndis.c:1.9.4.12 Tue Dec 27 11:37:36 2016
+++ src/sys/dev/usb/if_urndis.c Wed Dec 28 09:45:16 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urndis.c,v 1.9.4.12 2016/12/27 11:37:36 skrll Exp $ */
+/* $NetBSD: if_urndis.c,v 1.9.4.13 2016/12/28 09:45:16 skrll Exp $ */
/* $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
/*
@@ -21,7 +21,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.9.4.12 2016/12/27 11:37:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.9.4.13 2016/12/28 09:45:16 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1562,6 +1562,11 @@ urndis_detach(device_t self, int flags)
}
urndis_stop(ifp);
+
+ mutex_destroy(&sc->urndis_rxlock);
+ mutex_destroy(&sc->urndis_txlock);
+ mutex_destroy(&sc->urndis_lock);
+
sc->sc_attached = 0;
splx(s);
