Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6483cfe authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

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: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 063d8be3

drivers/net/wireless/ath9k/rc.c

+8 −10
Original line number Original line Diff line number Diff line
@@ -524,7 +524,7 @@ static u8 ath_rc_init_validrates(struct ath_rate_priv *ath_rc_priv, 
	u32 valid;

	u32 valid;





	for (i = 0; i < rate_table->rate_cnt; i++) {

	for (i = 0; i < rate_table->rate_cnt; i++) {

		valid = (ath_rc_priv->single_stream ?

		valid = (!(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG) ?

			 rate_table->info[i].valid_single_stream :

			 rate_table->info[i].valid_single_stream :

			 rate_table->info[i].valid);

			 rate_table->info[i].valid);

		if (valid == 1) {

		if (valid == 1) {
@@ -557,7 +557,7 @@ static u8 ath_rc_setvalid_rates(struct ath_rate_priv *ath_rc_priv, 
	for (i = 0; i < rateset->rs_nrates; i++) {

	for (i = 0; i < rateset->rs_nrates; i++) {

		for (j = 0; j < rate_table->rate_cnt; j++) {

		for (j = 0; j < rate_table->rate_cnt; j++) {

			u32 phy = rate_table->info[j].phy;

			u32 phy = rate_table->info[j].phy;

			u32 valid = (ath_rc_priv->single_stream ?

			u32 valid = (!(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG) ?

				     rate_table->info[j].valid_single_stream :

				     rate_table->info[j].valid_single_stream :

				     rate_table->info[j].valid);

				     rate_table->info[j].valid);

			u8 rate = rateset->rs_rates[i];

			u8 rate = rateset->rs_rates[i];
@@ -603,7 +603,7 @@ static u8 ath_rc_setvalid_htrates(struct ath_rate_priv *ath_rc_priv, 
	for (i = 0; i < rateset->rs_nrates; i++) {

	for (i = 0; i < rateset->rs_nrates; i++) {

		for (j = 0; j < rate_table->rate_cnt; j++) {

		for (j = 0; j < rate_table->rate_cnt; j++) {

			u32 phy = rate_table->info[j].phy;

			u32 phy = rate_table->info[j].phy;

			u32 valid = (ath_rc_priv->single_stream ?

			u32 valid = (!(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG) ?

				     rate_table->info[j].valid_single_stream :

				     rate_table->info[j].valid_single_stream :

				     rate_table->info[j].valid);

				     rate_table->info[j].valid);

			u8 rate = rateset->rs_rates[i];

			u8 rate = rateset->rs_rates[i];
@@ -740,9 +740,10 @@ static u8 ath_rc_ratefind_ht(struct ath_softc *sc, 
	if (rate > (ath_rc_priv->rate_table_size - 1))

	if (rate > (ath_rc_priv->rate_table_size - 1))

		rate = ath_rc_priv->rate_table_size - 1;

		rate = ath_rc_priv->rate_table_size - 1;





	ASSERT((rate_table->info[rate].valid && !ath_rc_priv->single_stream) ||

	ASSERT((rate_table->info[rate].valid &&

		(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG)) ||

	       (rate_table->info[rate].valid_single_stream &&

	       (rate_table->info[rate].valid_single_stream &&

		ath_rc_priv->single_stream));

		!(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG)));





	return rate;

	return rate;

}

}
@@ -1422,9 +1423,6 @@ static void ath_rc_init(struct ath_softc *sc, 
	}

	}

	ath_rc_priv->rc_phy_mode = ath_rc_priv->ht_cap & WLAN_RC_40_FLAG;

	ath_rc_priv->rc_phy_mode = ath_rc_priv->ht_cap & WLAN_RC_40_FLAG;





	/* Set stream capability */

	ath_rc_priv->single_stream = (ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG) ? 0 : 1;



	if (!rateset->rs_nrates) {

	if (!rateset->rs_nrates) {

		/* No working rate, just initialize valid rates */

		/* No working rate, just initialize valid rates */

		hi = ath_rc_init_validrates(ath_rc_priv, rate_table,

		hi = ath_rc_init_validrates(ath_rc_priv, rate_table,

drivers/net/wireless/ath9k/rc.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -157,7 +157,6 @@ struct ath_rateset { 
 * @probe_interval: interval for ratectrl to probe for other rates

 * @probe_interval: interval for ratectrl to probe for other rates

 * @prev_data_rix: rate idx of last data frame

 * @prev_data_rix: rate idx of last data frame

 * @ht_cap: HT capabilities

 * @ht_cap: HT capabilities

 * @single_stream: When TRUE, only single TX stream possible

 * @neg_rates: Negotatied rates

 * @neg_rates: Negotatied rates

 * @neg_ht_rates: Negotiated HT rates

 * @neg_ht_rates: Negotiated HT rates

 */

 */
@@ -175,7 +174,6 @@ struct ath_rate_priv { 
	u8 max_valid_rate;

	u8 max_valid_rate;

	u8 valid_rate_index[RATE_TABLE_SIZE];

	u8 valid_rate_index[RATE_TABLE_SIZE];

	u8 ht_cap;

	u8 ht_cap;

	u8 single_stream;

	u8 valid_phy_ratecnt[WLAN_RC_PHY_MAX];

	u8 valid_phy_ratecnt[WLAN_RC_PHY_MAX];

	u8 valid_phy_rateidx[WLAN_RC_PHY_MAX][RATE_TABLE_SIZE];

	u8 valid_phy_rateidx[WLAN_RC_PHY_MAX][RATE_TABLE_SIZE];

	u8 rc_phy_mode;

	u8 rc_phy_mode;