From owner-p4-projects@FreeBSD.ORG  Sat Apr  5 23:26:46 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 307231065672; Sat,  5 Apr 2008 23:26:46 +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 CC65B106566C
	for <perforce@freebsd.org>; Sat,  5 Apr 2008 23:26:45 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B072A8FC1A
	for <perforce@freebsd.org>; Sat,  5 Apr 2008 23:26:45 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m35NQjMb074660
	for <perforce@freebsd.org>; Sat, 5 Apr 2008 23:26:45 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m35NQjIp074658
	for perforce@freebsd.org; Sat, 5 Apr 2008 23:26:45 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 5 Apr 2008 23:26:45 GMT
Message-Id: <200804052326.m35NQjIp074658@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 139437 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: Sat, 05 Apr 2008 23:26:46 -0000

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

Change 139437 by sam@sam_ebb on 2008/04/05 23:25:59

	o eliminate locking in ieee80211_scan_next; just fire a callout
	  to happen immediately (avoids common LOR with driver softc lock)
	o add assert in scan_curchan

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_scan.c#20 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_scan.c#20 (text+ko) ====

@@ -806,16 +806,9 @@
 ieee80211_scan_next(struct ieee80211vap *vap)
 {
 	struct ieee80211com *ic = vap->iv_ic;
+	struct ieee80211_scan_state *ss = ic->ic_scan;
 
-	/*
-	 * XXX: We might need/want to decouple context here by either:
-	 *  callout_reset(&SCAN_PRIVATE(ss)->ss_scan_timer, 0, scan_next, ss);
-	 * or using a taskqueue.  Let's see what kind of problems direct
-	 * dispatch has for now.
-	 */
-	IEEE80211_LOCK(ic);
-	scan_next(ic->ic_scan);
-	IEEE80211_UNLOCK(ic);
+	callout_reset(&SCAN_PRIVATE(ss)->ss_scan_timer, 0, scan_next, ss);
 }
 
 /*
@@ -881,6 +874,8 @@
 {
 	struct ieee80211vap *vap  = ss->ss_vap;
 
+	IEEE80211_LOCK_ASSERT(vap->iv_ic);
+
 	if (ss->ss_flags & IEEE80211_SCAN_ACTIVE)
 		ieee80211_probe_curchan(vap, 0);
 	callout_reset(&SCAN_PRIVATE(ss)->ss_scan_timer,