From owner-svn-src-head@FreeBSD.ORG  Fri Apr 17 16:07:14 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 0EE481065679;
	Fri, 17 Apr 2009 16:07:14 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F17CE8FC25;
	Fri, 17 Apr 2009 16:07:13 +0000 (UTC)
	(envelope-from thompsa@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 n3HG7D7U027312;
	Fri, 17 Apr 2009 16:07:13 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3HG7DrR027311;
	Fri, 17 Apr 2009 16:07:13 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200904171607.n3HG7DrR027311@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Fri, 17 Apr 2009 16:07:13 +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: r191207 - head/sys/dev/ipw
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: Fri, 17 Apr 2009 16:07:14 -0000

Author: thompsa
Date: Fri Apr 17 16:07:13 2009
New Revision: 191207
URL: http://svn.freebsd.org/changeset/base/191207

Log:
  Drain the driver tasks on the same taskqueue in which they were enqueued.

Modified:
  head/sys/dev/ipw/if_ipw.c

Modified: head/sys/dev/ipw/if_ipw.c
==============================================================================
--- head/sys/dev/ipw/if_ipw.c	Fri Apr 17 15:54:41 2009	(r191206)
+++ head/sys/dev/ipw/if_ipw.c	Fri Apr 17 16:07:13 2009	(r191207)
@@ -417,9 +417,9 @@ ipw_detach(device_t dev)
 	ieee80211_ifdetach(ic);
 
 	callout_drain(&sc->sc_wdtimer);
-	taskqueue_drain(taskqueue_fast, &sc->sc_init_task);
-	taskqueue_drain(taskqueue_fast, &sc->sc_scan_task);
-	taskqueue_drain(taskqueue_fast, &sc->sc_bmiss_task);
+	taskqueue_drain(taskqueue_swi, &sc->sc_init_task);
+	taskqueue_drain(taskqueue_swi, &sc->sc_scan_task);
+	taskqueue_drain(taskqueue_swi, &sc->sc_bmiss_task);
 
 	ipw_release(sc);