Date: Sun, 6 Apr 2008 22:26:29 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 139478 for review Message-ID: <200804062226.m36MQT27030565@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804062226.m36MQT27030565>