From owner-svn-src-user@FreeBSD.ORG  Wed Apr 15 14:55:18 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E881E1065673;
	Wed, 15 Apr 2009 14:55:18 +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 D77E18FC2B;
	Wed, 15 Apr 2009 14:55:18 +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 n3FEtI3T045884;
	Wed, 15 Apr 2009 14:55:18 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3FEtILS045883;
	Wed, 15 Apr 2009 14:55:18 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200904151455.n3FEtILS045883@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Wed, 15 Apr 2009 14:55:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191103 - user/thompsa/vaptq/sys/net80211
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Apr 2009 14:55:19 -0000

Author: thompsa
Date: Wed Apr 15 14:55:18 2009
New Revision: 191103
URL: http://svn.freebsd.org/changeset/base/191103

Log:
  - Dont hold the lock over ic_set_channel
  - Mark ieee80211_setcurchan() with XXX as its now async

Modified:
  user/thompsa/vaptq/sys/net80211/ieee80211_scan.c

Modified: user/thompsa/vaptq/sys/net80211/ieee80211_scan.c
==============================================================================
--- user/thompsa/vaptq/sys/net80211/ieee80211_scan.c	Wed Apr 15 14:51:41 2009	(r191102)
+++ user/thompsa/vaptq/sys/net80211/ieee80211_scan.c	Wed Apr 15 14:55:18 2009	(r191103)
@@ -308,7 +308,9 @@ change_channel(struct ieee80211com *ic,
 {
 	ic->ic_curchan = chan;
 	ic->ic_rt = ieee80211_get_ratetable(chan);
+	IEEE80211_UNLOCK(ic);
 	ic->ic_set_channel(ic);
+	IEEE80211_LOCK(ic);
 }
 
 static char
@@ -961,7 +963,7 @@ scan_task(void *arg, int pending)
 	/* return to the bss channel */
 	if (ic->ic_bsschan != IEEE80211_CHAN_ANYC &&
 	    ic->ic_curchan != ic->ic_bsschan)
-		ieee80211_setcurchan(ic, ic->ic_bsschan);
+		ieee80211_setcurchan(ic, ic->ic_bsschan); /* XXX */
 	/* clear internal flags and any indication of a pick */
 	SCAN_PRIVATE(ss)->ss_iflags &= ~ISCAN_REP;
 	ss->ss_flags &= ~IEEE80211_SCAN_GOTPICK;