PERFORCE change 118779 for review

[Sepherosa Ziehau]

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

Change 118779 by sephe at sephe_zealot:sam_wifi on 2007/04/25 12:25:58

	ieee80211com.ic_fixed_rate holds rate instead of rate index.

Affected files ...

.. //depot/projects/wifi/sys/dev/ral/rt2560.c#20 edit
.. //depot/projects/wifi/sys/dev/ral/rt2661.c#12 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ral/rt2560.c#20 (text) ====

@@ -1773,7 +1773,6 @@
 	struct rt2560_tx_desc *desc;
 	struct rt2560_tx_data *data;
 	struct rt2560_node *rn;
-	struct ieee80211_rateset *rs;
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *k;
 	struct mbuf *mnew;
@@ -1785,9 +1784,10 @@
 	wh = mtod(m0, struct ieee80211_frame *);
 
 	if (ic->ic_fixed_rate != IEEE80211_FIXED_RATE_NONE) {
-		rs = &ic->ic_sup_rates[ic->ic_curmode];
-		rate = rs->rs_rates[ic->ic_fixed_rate];
+		rate = ic->ic_fixed_rate;
 	} else {
+		struct ieee80211_rateset *rs;
+
 		rs = &ni->ni_rates;
 		rn = (struct rt2560_node *)ni;
 		ni->ni_txrate = ral_rssadapt_choose(&rn->rssadapt, rs, wh,

==== //depot/projects/wifi/sys/dev/ral/rt2661.c#12 (text) ====

@@ -1534,7 +1534,6 @@
 	struct rt2661_tx_desc *desc;
 	struct rt2661_tx_data *data;
 	struct rt2661_node *rn;
-	struct ieee80211_rateset *rs;
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *k;
 	const struct chanAccParams *cap;
@@ -1547,9 +1546,10 @@
 	wh = mtod(m0, struct ieee80211_frame *);
 
 	if (ic->ic_fixed_rate != IEEE80211_FIXED_RATE_NONE) {
-		rs = &ic->ic_sup_rates[ic->ic_curmode];
-		rate = rs->rs_rates[ic->ic_fixed_rate];
+		rate = ic->ic_fixed_rate;
 	} else {
+		struct ieee80211_rateset *rs;
+
 		rs = &ni->ni_rates;
 		rn = (struct rt2661_node *)ni;
 		ni->ni_txrate = ral_rssadapt_choose(&rn->rssadapt, rs,