PERFORCE change 83748 for review

[Sam Leffler]

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

Change 83748 by sam at sam_ebb on 2005/09/16 16:56:24

	optimize cancel scan; check if cancel already requested

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_scan.c#3 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_scan.c#3 (text+ko) ====

@@ -554,7 +554,8 @@
 	struct ieee80211_scan_state *ss = ic->ic_scan;
 
 	IEEE80211_LOCK(ic);
-	if (ic->ic_flags & IEEE80211_F_SCAN) {
+	if ((ic->ic_flags & IEEE80211_F_SCAN) &&
+	    (SCAN_PRIVATE(ss)->ss_iflags & ISCAN_CANCEL) == 0) {
 		IEEE80211_DPRINTF(ic, IEEE80211_MSG_SCAN,
 		    "%s: cancel %s scan\n", __func__,
 		    ss->ss_flags & IEEE80211_SCAN_ACTIVE ?