From owner-p4-projects@FreeBSD.ORG  Mon May 18 08:46:25 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D250D1065691; Mon, 18 May 2009 08:46:24 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8BDE910656BC
	for <perforce@FreeBSD.org>; Mon, 18 May 2009 08:46:24 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 795908FC08
	for <perforce@FreeBSD.org>; Mon, 18 May 2009 08:46:24 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4I8kO0s086105
	for <perforce@FreeBSD.org>; Mon, 18 May 2009 08:46:24 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4I8kOB6086103
	for perforce@freebsd.org; Mon, 18 May 2009 08:46:24 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 18 May 2009 08:46:24 GMT
Message-Id: <200905180846.n4I8kOB6086103@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 162250 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 May 2009 08:46:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=162250

Change 162250 by hselasky@hselasky_laptop001 on 2009/05/18 08:46:20

	
	USB WLAN:
	  - correct order of operation at detach

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#4 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#2 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#4 (text+ko) ====

@@ -514,6 +514,8 @@
 	if (!device_is_attached(dev))
 		return (0);
 
+	usb2_transfer_unsetup(sc->sc_xfer, UATH_N_XFERS);
+
 	sc->sc_flags |= UATH_FLAG_INVALID;
 	uath_stop(ifp);
 	ieee80211_ifdetach(ic);
@@ -521,8 +523,6 @@
 	callout_drain(&sc->stat_ch);
 	callout_drain(&sc->watchdog_ch);
 
-	usb2_transfer_unsetup(sc->sc_xfer, UATH_N_XFERS);
-
 	/* free buffers */
 	UATH_LOCK(sc);
 	uath_free_rx_data_list(sc);

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#2 (text+ko) ====

@@ -2001,13 +2001,14 @@
 	if (!device_is_attached(dev))
 		return 0;
 
+	usb2_transfer_unsetup(sc->sc_xfer, UPGT_N_XFERS);
+
 	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);
 	upgt_free_rx(sc);
 	upgt_free_tx(sc);