From owner-svn-src-head@FreeBSD.ORG  Wed May 20 03:49:17 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 37E081065679;
	Wed, 20 May 2009 03:49:17 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 25EC38FC16;
	Wed, 20 May 2009 03:49:17 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4K3nHdb018259;
	Wed, 20 May 2009 03:49:17 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4K3nHSe018257;
	Wed, 20 May 2009 03:49:17 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <200905200349.n4K3nHSe018257@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Wed, 20 May 2009 03:49:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192419 - head/sys/dev/usb/wlan
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 May 2009 03:49:17 -0000

Author: weongyo
Date: Wed May 20 03:49:16 2009
New Revision: 192419
URL: http://svn.freebsd.org/changeset/base/192419

Log:
  try to unsetup USB xfers before calling ieee80211_ifdetach() to fix a
  bug referencing a destroyed lock within TX callbacks during device
  detach.
  
  Submitted by:	hps (original version)
  Tested by:	Lucius Windschuh <lwindschuh at googlemail.com>

Modified:
  head/sys/dev/usb/wlan/if_uath.c
  head/sys/dev/usb/wlan/if_upgt.c

Modified: head/sys/dev/usb/wlan/if_uath.c
==============================================================================
--- head/sys/dev/usb/wlan/if_uath.c	Wed May 20 03:33:27 2009	(r192418)
+++ head/sys/dev/usb/wlan/if_uath.c	Wed May 20 03:49:16 2009	(r192419)
@@ -517,12 +517,12 @@ uath_detach(device_t dev)
 
 	sc->sc_flags |= UATH_FLAG_INVALID;
 	uath_stop(ifp);
-	ieee80211_ifdetach(ic);
 
 	callout_drain(&sc->stat_ch);
 	callout_drain(&sc->watchdog_ch);
 
 	usb2_transfer_unsetup(sc->sc_xfer, UATH_N_XFERS);
+	ieee80211_ifdetach(ic);
 
 	/* free buffers */
 	UATH_LOCK(sc);

Modified: head/sys/dev/usb/wlan/if_upgt.c
==============================================================================
--- head/sys/dev/usb/wlan/if_upgt.c	Wed May 20 03:33:27 2009	(r192418)
+++ head/sys/dev/usb/wlan/if_upgt.c	Wed May 20 03:49:16 2009	(r192419)
@@ -2002,12 +2002,12 @@ upgt_detach(device_t dev)
 		return 0;
 
 	upgt_stop(sc);
-	ieee80211_ifdetach(ic);
 
 	callout_drain(&sc->sc_led_ch);
 	callout_drain(&sc->sc_watchdog_ch);
 
 	usb2_transfer_unsetup(sc->sc_xfer, UPGT_N_XFERS);
+	ieee80211_ifdetach(ic);
 	upgt_free_rx(sc);
 	upgt_free_tx(sc);