PERFORCE change 120528 for review

[Andrew Thompson]

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

Change 120528 by thompsa at thompsa_heff on 2007/05/28 23:52:53

	Allow scans to be aborted by catching the return status and not
	scheduling another scan if it was aborted.

Affected files ...

.. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#27 edit
.. //depot/projects/wifi/sys/dev/iwi/if_iwireg.h#10 edit

Differences ...

==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#27 (text+ko) ====

@@ -1384,7 +1384,15 @@
 
 		sc->sc_scan_timer = 0;
 		sc->flags &= ~IWI_FLAG_SCANNING;
-		ieee80211_scan_next(ic);
+
+		switch (scan->status) {
+		case IWI_SCAN_COMPLETED:
+			ieee80211_scan_next(ic);
+			break;
+		case IWI_SCAN_ABORTED:
+			ieee80211_cancel_scan(ic);
+			break;
+		}
 
 		break;
 

==== //depot/projects/wifi/sys/dev/iwi/if_iwireg.h#10 (text+ko) ====

@@ -417,6 +417,10 @@
 #define IWI_SCAN_TYPE_BDIRECTED		4 /* active, directed+bcast probe */
 #define IWI_SCAN_TYPES			5
 
+/* scan result codes */
+#define IWI_SCAN_COMPLETED		1 /* scan compeleted sucessfully */
+#define IWI_SCAN_ABORTED		2 /* scan was aborted by the driver */
+
 /* structure for command IWI_CMD_SCAN_EXT */
 struct iwi_scan_ext {
 	uint32_t	full_scan_index;