PERFORCE change 114197 for review

[Sam Leffler]

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

Change 114197 by sam at sam_ebb on 2007/02/07 18:49:20

	oops, this explains why the sr9 didn't scan properly

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#14 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_var.h#45 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#14 (text+ko) ====

@@ -693,13 +693,7 @@
 
 	okrate = badrate = fixedrate = 0;
 
-	if (IEEE80211_IS_CHAN_HALF(se->se_chan)) {
-		srs = &ic->ic_sup_half_rates;
-	} else if (IEEE80211_IS_CHAN_QUARTER(se->se_chan)) {
-		srs = &ic->ic_sup_quarter_rates;
-	} else {
-		srs = &ic->ic_sup_rates[ieee80211_chan2mode(se->se_chan)];
-	}
+	srs = ieee80211_get_suprates(ic, se->se_chan);
 	nrs = se->se_rates[1];
 	rs = se->se_rates+2;
 	fixedrate = IEEE80211_FIXED_RATE_NONE;

==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#45 (text+ko) ====

@@ -114,8 +114,6 @@
 	u_int16_t		ic_modecaps;	/* set of mode capabilities */
 	u_int16_t		ic_curmode;	/* current mode */
 	struct ieee80211_rateset ic_sup_rates[IEEE80211_MODE_MAX];
-	struct ieee80211_rateset ic_sup_half_rates;
-	struct ieee80211_rateset ic_sup_quarter_rates;
 	u_int16_t		ic_bintval;	/* beacon interval */
 	u_int16_t		ic_lintval;	/* listen interval */
 	u_int16_t		ic_holdover;	/* PM hold over duration */