diff options
| author | Vivek Natarajan <nataraja@qti.qualcomm.com> | 2015-10-06 15:19:34 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-09 14:34:33 -0500 |
| commit | 3a0ff96194c14f7915e571553a2328e477da8c97 (patch) | |
| tree | 316fff99732d1af29c3368cb1a0843976f58fe64 /drivers | |
| parent | 92f503d0b0491f90c196a1ed3dda601c4016b1a3 (diff) | |
| download | linux-stable-3a0ff96194c14f7915e571553a2328e477da8c97.tar.gz linux-stable-3a0ff96194c14f7915e571553a2328e477da8c97.tar.bz2 linux-stable-3a0ff96194c14f7915e571553a2328e477da8c97.zip | |
ath10k: use station's current operating mode from assoc request
commit 72f8cef5d1155209561b01e092ce1a04ad50c4cb upstream.
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 <nataraja@qti.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/mac.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 64674c955d44..ae90a2cdab9b 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -2083,7 +2083,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); @@ -2168,7 +2169,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", |