mt76: fix antenna config missing in 6G cap

Commit Message

Deren Wu April 9, 2022, 1:44 p.m. UTC

From: Deren Wu <[e-mail]>

To make sure we have the proper antenna config in 6g cap,
move IEEE80211_VHT_CAP_[T/R]X_ANTENNA_PATTERN to stream init.

Fixes: f1103fa6b3492 ("mt76: add TX/RX antenna pattern capabilities")
Signed-off-by: Deren Wu <[e-mail]>
---
 drivers/net/wireless/mediatek/mt76/mac80211.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Felix Fietkau April 20, 2022, 10:54 a.m. UTC | #1

On 09.04.22 15:44, Deren Wu wrote:
> From: Deren Wu <[e-mail]>
> 
> To make sure we have the proper antenna config in 6g cap,
> move IEEE80211_VHT_CAP_[T/R]X_ANTENNA_PATTERN to stream init.
> 
> Fixes: f1103fa6b3492 ("mt76: add TX/RX antenna pattern capabilities")
The fixes line is wrong, since that commit is older than 6G support in 
mt76. I will change it to this instead:
Fixes: edf9dab8ba27 ("mt76: add 6GHz support")

Thanks,

- Felix

Patch

diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 026ab1e16d45..2dd3ebd1863f 100644
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -248,6 +248,8 @@  static void mt76_init_stream_cap(struct mt76_phy *phy,
 		vht_cap->cap |= IEEE80211_VHT_CAP_TXSTBC;
 	else
 		vht_cap->cap &= ~IEEE80211_VHT_CAP_TXSTBC;
+	vht_cap->cap |= IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN |
+			IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN;
 
 	for (i = 0; i < 8; i++) {
 		if (i < nstream)
@@ -323,8 +325,6 @@  mt76_init_sband(struct mt76_phy *phy, struct mt76_sband *msband,
 	vht_cap->cap |= IEEE80211_VHT_CAP_RXLDPC |
 			IEEE80211_VHT_CAP_RXSTBC_1 |
 			IEEE80211_VHT_CAP_SHORT_GI_80 |
-			IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN |
-			IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN |
 			(3 << IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT);
 
 	return 0;