From owner-p4-projects@FreeBSD.ORG  Sun Apr  6 22:26:30 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6A1551065677; Sun,  6 Apr 2008 22:26:30 +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 2CBF7106566B
	for <perforce@freebsd.org>; Sun,  6 Apr 2008 22:26:30 +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 133168FC19
	for <perforce@freebsd.org>; Sun,  6 Apr 2008 22:26:30 +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 m36MQTKC030567
	for <perforce@freebsd.org>; Sun, 6 Apr 2008 22:26:29 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m36MQT27030565
	for perforce@freebsd.org; Sun, 6 Apr 2008 22:26:29 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 6 Apr 2008 22:26:29 GMT
Message-Id: <200804062226.m36MQT27030565@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 139478 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: Sun, 06 Apr 2008 22:26:30 -0000

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

Change 139478 by sam@sam_ebb on 2008/04/06 22:25:48

	always use IEEE80211_IOC_SCAN_NOJOIN instead of
	IEEE80211_IOC_SCAN_NOPICK; this should be equivalent but works
	around the current behaviour that scan requests with a vap in
	INIT state are deferred to the state machine at which point
	we've lost the IEEE80211_IOC_SCAN_CHECK bit to use in deciding
	wether to call ieee80211_check_scan or ieee80211_scan_start

Affected files ...

.. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#9 edit

Differences ...

==== //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#9 (text+ko) ====

@@ -483,6 +483,7 @@
 	memset(&sr, 0, sizeof(sr));
 	sr.sr_flags = IEEE80211_IOC_SCAN_ACTIVE
 		    | IEEE80211_IOC_SCAN_ONCE
+		    | IEEE80211_IOC_SCAN_NOJOIN
 		    ;
 	sr.sr_duration = IEEE80211_IOC_SCAN_FOREVER;
 	if (ssid_len != 0) {
@@ -506,12 +507,8 @@
 		/* NB: clear so we don't retry w/o associating first */
 		drv->lastssid_len = 0;
 	}
-	if (sr.sr_nssid != 0) {		/* NB: check scan cache first */
-		sr.sr_flags |= IEEE80211_IOC_SCAN_CHECK
-			    |  IEEE80211_IOC_SCAN_NOJOIN
-			    ;
-	} else
-		sr.sr_flags |= IEEE80211_IOC_SCAN_NOPICK;
+	if (sr.sr_nssid != 0)		/* NB: check scan cache first */
+		sr.sr_flags |= IEEE80211_IOC_SCAN_CHECK;
 
 	/* NB: net80211 delivers a scan complete event so no need to poll */
 	return set80211var(drv, IEEE80211_IOC_SCAN_REQ, &sr, sizeof(sr));