diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2009-03-30 05:58:56 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:54:35 -0400 |
commit | c6483cfe7147534719197c03a99848f49e004308 (patch) | |
tree | 20aa299c2477ae6f5b84a2cf2bd19e25b31415fc /drivers | |
parent | 063d8be37d6f5818976a1185db4af55c5a5ae809 (diff) |
ath9k: Determine number of streams from HT capabilities
The number of streams supported by a STA can be determined
directly from the HT capabilities. Remove the redundant
variable storing the stream cap.
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath9k/rc.c | 18 | ||||
-rw-r--r-- | drivers/net/wireless/ath9k/rc.h | 2 |
2 files changed, 8 insertions, 12 deletions
diff --git a/drivers/net/wireless/ath9k/rc.c b/drivers/net/wireless/ath9k/rc.c index 824ccbb8b7b8..a6933ccab483 100644 --- a/drivers/net/wireless/ath9k/rc.c +++ b/drivers/net/wireless/ath9k/rc.c | |||
@@ -524,7 +524,7 @@ static u8 ath_rc_init_validrates(struct ath_rate_priv *ath_rc_priv, | |||
524 | u32 valid; | 524 | u32 valid; |
525 | 525 | ||
526 | for (i = 0; i < rate_table->rate_cnt; i++) { | 526 | for (i = 0; i < rate_table->rate_cnt; i++) { |
527 | valid = (ath_rc_priv->single_stream ? | 527 | valid = (!(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG) ? |
528 | rate_table->info[i].valid_single_stream : | 528 | rate_table->info[i].valid_single_stream : |
529 | rate_table->info[i].valid); | 529 | rate_table->info[i].valid); |
530 | if (valid == 1) { | 530 | if (valid == 1) { |
@@ -557,9 +557,9 @@ static u8 ath_rc_setvalid_rates(struct ath_rate_priv *ath_rc_priv, | |||
557 | for (i = 0; i < rateset->rs_nrates; i++) { | 557 | for (i = 0; i < rateset->rs_nrates; i++) { |
558 | for (j = 0; j < rate_table->rate_cnt; j++) { | 558 | for (j = 0; j < rate_table->rate_cnt; j++) { |
559 | u32 phy = rate_table->info[j].phy; | 559 | u32 phy = rate_table->info[j].phy; |
560 | u32 valid = (ath_rc_priv->single_stream ? | 560 | u32 valid = (!(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG) ? |
561 | rate_table->info[j].valid_single_stream : | 561 | rate_table->info[j].valid_single_stream : |
562 | rate_table->info[j].valid); | 562 | rate_table->info[j].valid); |
563 | u8 rate = rateset->rs_rates[i]; | 563 | u8 rate = rateset->rs_rates[i]; |
564 | u8 dot11rate = rate_table->info[j].dot11rate; | 564 | u8 dot11rate = rate_table->info[j].dot11rate; |
565 | 565 | ||
@@ -603,7 +603,7 @@ static u8 ath_rc_setvalid_htrates(struct ath_rate_priv *ath_rc_priv, | |||
603 | for (i = 0; i < rateset->rs_nrates; i++) { | 603 | for (i = 0; i < rateset->rs_nrates; i++) { |
604 | for (j = 0; j < rate_table->rate_cnt; j++) { | 604 | for (j = 0; j < rate_table->rate_cnt; j++) { |
605 | u32 phy = rate_table->info[j].phy; | 605 | u32 phy = rate_table->info[j].phy; |
606 | u32 valid = (ath_rc_priv->single_stream ? | 606 | u32 valid = (!(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG) ? |
607 | rate_table->info[j].valid_single_stream : | 607 | rate_table->info[j].valid_single_stream : |
608 | rate_table->info[j].valid); | 608 | rate_table->info[j].valid); |
609 | u8 rate = rateset->rs_rates[i]; | 609 | u8 rate = rateset->rs_rates[i]; |
@@ -740,9 +740,10 @@ static u8 ath_rc_ratefind_ht(struct ath_softc *sc, | |||
740 | if (rate > (ath_rc_priv->rate_table_size - 1)) | 740 | if (rate > (ath_rc_priv->rate_table_size - 1)) |
741 | rate = ath_rc_priv->rate_table_size - 1; | 741 | rate = ath_rc_priv->rate_table_size - 1; |
742 | 742 | ||
743 | ASSERT((rate_table->info[rate].valid && !ath_rc_priv->single_stream) || | 743 | ASSERT((rate_table->info[rate].valid && |
744 | (ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG)) || | ||
744 | (rate_table->info[rate].valid_single_stream && | 745 | (rate_table->info[rate].valid_single_stream && |
745 | ath_rc_priv->single_stream)); | 746 | !(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG))); |
746 | 747 | ||
747 | return rate; | 748 | return rate; |
748 | } | 749 | } |
@@ -1422,9 +1423,6 @@ static void ath_rc_init(struct ath_softc *sc, | |||
1422 | } | 1423 | } |
1423 | ath_rc_priv->rc_phy_mode = ath_rc_priv->ht_cap & WLAN_RC_40_FLAG; | 1424 | ath_rc_priv->rc_phy_mode = ath_rc_priv->ht_cap & WLAN_RC_40_FLAG; |
1424 | 1425 | ||
1425 | /* Set stream capability */ | ||
1426 | ath_rc_priv->single_stream = (ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG) ? 0 : 1; | ||
1427 | |||
1428 | if (!rateset->rs_nrates) { | 1426 | if (!rateset->rs_nrates) { |
1429 | /* No working rate, just initialize valid rates */ | 1427 | /* No working rate, just initialize valid rates */ |
1430 | hi = ath_rc_init_validrates(ath_rc_priv, rate_table, | 1428 | hi = ath_rc_init_validrates(ath_rc_priv, rate_table, |
diff --git a/drivers/net/wireless/ath9k/rc.h b/drivers/net/wireless/ath9k/rc.h index ec72dd29da00..bdfd2052077c 100644 --- a/drivers/net/wireless/ath9k/rc.h +++ b/drivers/net/wireless/ath9k/rc.h | |||
@@ -157,7 +157,6 @@ struct ath_rateset { | |||
157 | * @probe_interval: interval for ratectrl to probe for other rates | 157 | * @probe_interval: interval for ratectrl to probe for other rates |
158 | * @prev_data_rix: rate idx of last data frame | 158 | * @prev_data_rix: rate idx of last data frame |
159 | * @ht_cap: HT capabilities | 159 | * @ht_cap: HT capabilities |
160 | * @single_stream: When TRUE, only single TX stream possible | ||
161 | * @neg_rates: Negotatied rates | 160 | * @neg_rates: Negotatied rates |
162 | * @neg_ht_rates: Negotiated HT rates | 161 | * @neg_ht_rates: Negotiated HT rates |
163 | */ | 162 | */ |
@@ -175,7 +174,6 @@ struct ath_rate_priv { | |||
175 | u8 max_valid_rate; | 174 | u8 max_valid_rate; |
176 | u8 valid_rate_index[RATE_TABLE_SIZE]; | 175 | u8 valid_rate_index[RATE_TABLE_SIZE]; |
177 | u8 ht_cap; | 176 | u8 ht_cap; |
178 | u8 single_stream; | ||
179 | u8 valid_phy_ratecnt[WLAN_RC_PHY_MAX]; | 177 | u8 valid_phy_ratecnt[WLAN_RC_PHY_MAX]; |
180 | u8 valid_phy_rateidx[WLAN_RC_PHY_MAX][RATE_TABLE_SIZE]; | 178 | u8 valid_phy_rateidx[WLAN_RC_PHY_MAX][RATE_TABLE_SIZE]; |
181 | u8 rc_phy_mode; | 179 | u8 rc_phy_mode; |