2015-10-05 16:02:24

by Vivek Natarajan

Subject: [PATCH v3] ath10k: Use station's current operating mode from assoc request

The current number of spatial streams used by the client is advertised
as a separate IE in assoc request. Use this information to set
the NSS operating mode.

Fixes: 45c9abc059fa ("ath10k: implement more versatile set_bitrate_mask").
Signed-off-by: Vivek Natarajan <[email protected]>
---
v3: Fix max_nss type.

drivers/net/wireless/ath/ath10k/mac.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 79490ad..32ad6f3 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -2084,7 +2084,8 @@ static void ath10k_peer_assoc_h_ht(struct ath10k *ar,
enum ieee80211_band band;
const u8 *ht_mcs_mask;
const u16 *vht_mcs_mask;
- int i, n, max_nss;
+ int i, n;
+ u8 max_nss;
u32 stbc;

lockdep_assert_held(&ar->conf_mutex);
@@ -2169,7 +2170,7 @@ static void ath10k_peer_assoc_h_ht(struct ath10k *ar,
arg->peer_ht_rates.rates[i] = i;
} else {
arg->peer_ht_rates.num_rates = n;
- arg->peer_num_spatial_streams = max_nss;
+ arg->peer_num_spatial_streams = min(sta->rx_nss, max_nss);
}

ath10k_dbg(ar, ATH10K_DBG_MAC, "mac ht peer %pM mcs cnt %d nss %d\n",
--
1.9.1

2015-10-09 08:37:48

by Kalle Valo

Subject: Re: [PATCH v3] ath10k: Use station's current operating mode from assoc request

Vivek Natarajan <[email protected]> writes:

> The current number of spatial streams used by the client is advertised
> as a separate IE in assoc request. Use this information to set
> the NSS operating mode.
>
> Fixes: 45c9abc059fa ("ath10k: implement more versatile set_bitrate_mask").
> Signed-off-by: Vivek Natarajan <[email protected]>

Applied, thanks.

--
Kalle Valo