| From | Greg Kroah-Hartman <> | Subject | [PATCH 4.2 089/124] ath10k: use stations current operating mode from assoc request | Date | Mon, 7 Dec 2015 09:56:19 -0500 |
| |
4.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vivek Natarajan <nataraja@qti.qualcomm.com>
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>
--- drivers/net/wireless/ath/ath10k/mac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
--- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -2070,7 +2070,8 @@ static void ath10k_peer_assoc_h_ht(struc 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); @@ -2155,7 +2156,7 @@ static void ath10k_peer_assoc_h_ht(struc 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",
|