diff mbox series

ath11k: mask out vht beamforming if a fixed rate is set

Message ID 20191217171827.6780-1-john@phrozen.org (mailing list archive)
State Changes Requested
Delegated to: Kalle Valo
Headers show
Series ath11k: mask out vht beamforming if a fixed rate is set | expand

Commit Message

John Crispin Dec. 17, 2019, 5:18 p.m. UTC 
From: Ritesh Singh <ritesi@codeaurora.org>

After setting a fixed vht-rate we see a FW assert if a STA tries to
(re)assoc with the mu_bfee cap set. This patch masks out the capability
bits if a fixed rate is set.

Reviewed-by: John Crispin <john@phrozen.org>
Signed-off-by: Ritesh Singh <ritesi@codeaurora.org>
---
 drivers/net/wireless/ath/ath11k/mac.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Kalle Valo Jan. 15, 2020, 9:25 a.m. UTC | #1 
John Crispin <john@phrozen.org> wrote:

> From: Ritesh Singh <ritesi@codeaurora.org>
> 
> After setting a fixed vht-rate we see a FW assert if a STA tries to
> (re)assoc with the mu_bfee cap set. This patch masks out the capability
> bits if a fixed rate is set.
> 
> Reviewed-by: John Crispin <john@phrozen.org>
> Signed-off-by: Ritesh Singh <ritesi@codeaurora.org>

John's s-o-b missing. Also no magic numbers, please. Isn't there a proper
define for 0x3?
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index b8be78dc295d..7f17d0e4cb96 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -1126,6 +1126,9 @@  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 & 0x3) == 0x3)
+		arg->peer_vht_caps &= ~IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE;
+
 	/* TODO:  Check */
 	arg->tx_max_mcs_nss = 0xFF;