From owner-svn-src-all@FreeBSD.ORG  Sun May  3 22:47:06 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EB8D6B7;
 Sun,  3 May 2015 22:47:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D98A81531;
 Sun,  3 May 2015 22:47:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t43Ml6ku069407;
 Sun, 3 May 2015 22:47:06 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t43Ml6Nq069406;
 Sun, 3 May 2015 22:47:06 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201505032247.t43Ml6Nq069406@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 3 May 2015 22:47:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282377 - head/sys/dev/wpi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 May 2015 22:47:07 -0000

Author: adrian
Date: Sun May  3 22:47:06 2015
New Revision: 282377
URL: https://svnweb.freebsd.org/changeset/base/282377

Log:
  Move radiooff_task to the internal taskqueue.
  
  PR:		kern/197143
  Submitted by:	Andriy Voskoboinyk <s3erios@gmail.com>

Modified:
  head/sys/dev/wpi/if_wpi.c

Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c	Sun May  3 22:43:45 2015	(r282376)
+++ head/sys/dev/wpi/if_wpi.c	Sun May  3 22:47:06 2015	(r282377)
@@ -688,8 +688,6 @@ wpi_detach(device_t dev)
 	if (ifp != NULL) {
 		ic = ifp->if_l2com;
 
-		ieee80211_draintask(ic, &sc->sc_reinittask);
-		ieee80211_draintask(ic, &sc->sc_radiooff_task);
 		ieee80211_draintask(ic, &sc->sc_radioon_task);
 		ieee80211_draintask(ic, &sc->sc_start_task);
 
@@ -2168,7 +2166,8 @@ wpi_notif_intr(struct wpi_softc *sc)
 				WPI_NT_LOCK(sc);
 				wpi_clear_node_table(sc);
 				WPI_NT_UNLOCK(sc);
-				ieee80211_runtask(ic, &sc->sc_radiooff_task);
+				taskqueue_enqueue(sc->sc_tq,
+				    &sc->sc_radiooff_task);
 				return;
 			}
 			break;