PERFORCE change 115712 for review

[Sam Leffler]

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

Change 115712 by sam at sam_ebb on 2007/03/11 08:00:25

	correct modecaps checks

Affected files ...

.. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#23 edit

Differences ...

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

@@ -2653,8 +2653,6 @@
 static int
 iwi_scan(struct iwi_softc *sc)
 {
-#define	IEEE80211_MODE_5GHZ	(1<<IEEE80211_MODE_11A)
-#define	IEEE80211_MODE_2GHZ	((1<<IEEE80211_MODE_11B)|1<<IEEE80211_MODE_11G)
 	struct ieee80211com *ic = &sc->sc_ic;
 	const struct ieee80211_channel *c;
 	struct iwi_scan_ext scan;
@@ -2689,7 +2687,7 @@
 		scan_type = IWI_SCAN_TYPE_BROADCAST;
 
 	ix = 0;
-	if (isset(ic->ic_modecaps, IEEE80211_MODE_5GHZ)) {
+	if (isset(ic->ic_modecaps, IEEE80211_MODE_11A)) {
 		start = ix;
 		for (i = 0; i <= IEEE80211_CHAN_MAX; i++) {
 			c = &ic->ic_channels[i];
@@ -2713,7 +2711,7 @@
 			ix++;
 		}
 	}
-	if (isset(ic->ic_modecaps, IEEE80211_MODE_2GHZ)) {
+	if (isset(ic->ic_modecaps, IEEE80211_MODE_11B)) {
 		start = ix;
 		for (i = 0; i <= IEEE80211_CHAN_MAX; i++) {
 			c = &ic->ic_channels[i];
@@ -2741,8 +2739,6 @@
 	sc->sc_ifp->if_timer = 1;
 	sc->flags |= IWI_FLAG_SCANNING;
 	return iwi_cmd(sc, IWI_CMD_SCAN_EXT, &scan, sizeof scan);
-#undef IEEE80211_MODE_5GHZ
-#undef IEEE80211_MODE_2GHZ
 }
 
 static void