diff mbox series

ath11k: Fix fw assert by setting proper vht cap

Message ID 1586538405-16226-2-git-send-email-mkenna@codeaurora.org (mailing list archive)
State Accepted
Commit 40c766d4a49cdfe30e0fb40825321b4d4de651aa
Delegated to: Kalle Valo
Headers show
Series ath11k: Fix fw assert by setting proper vht cap | expand

Commit Message

Maharaja Kennadyrajan April 10, 2020, 5:06 p.m. UTC 
From: Ritesh Singh <ritesi@codeaurora.org>

After setting fixed vht-rate if new station is trying to
assoc with mu_bfee cap, or if a sta is already connected
with mu_bfee cap then set the fixed vht-rate and
reconnecting the sta, FW assert is happening.

So to avoid this, reset the MU_BEAMFORMEE bit in vht->caps,
if mcs_index is invalid for nss 1.

Signed-off-by: Ritesh Singh <ritesi@codeaurora.org>
Signed-off-by: Maharaja Kennadyrajan <mkenna@codeaurora.org>
---
 drivers/net/wireless/ath/ath11k/mac.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Kalle Valo April 15, 2020, 8 a.m. UTC | #1 
Maharaja Kennadyrajan <mkenna@codeaurora.org> wrote:

> After setting fixed vht-rate if new station is trying to
> assoc with mu_bfee cap, or if a sta is already connected
> with mu_bfee cap then set the fixed vht-rate and
> reconnecting the sta, FW assert is happening.
> 
> So to avoid this, reset the MU_BEAMFORMEE bit in vht->caps,
> if mcs_index is invalid for nss 1.
> 
> Signed-off-by: Ritesh Singh <ritesi@codeaurora.org>
> Signed-off-by: Maharaja Kennadyrajan <mkenna@codeaurora.org>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

Patch applied to ath-next branch of ath.git, thanks.

40c766d4a49c ath11k: Fix fw assert by setting proper vht cap
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 9f8bc19..29e1267 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -1142,6 +1142,10 @@  static void ath11k_peer_assoc_h_vht(struct ath11k *ar,
 	arg->tx_mcs_set &= ~IEEE80211_VHT_MCS_SUPPORT_0_11_MASK;
 	arg->tx_mcs_set |= IEEE80211_DISABLE_VHT_MCS_SUPPORT_0_11;
 
+	if ((arg->tx_mcs_set & IEEE80211_VHT_MCS_NOT_SUPPORTED) ==
+			IEEE80211_VHT_MCS_NOT_SUPPORTED)
+		arg->peer_vht_caps &= ~IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE;
+
 	/* TODO:  Check */
 	arg->tx_max_mcs_nss = 0xFF;