mt76: fix antenna config missing in 6G cap

[ Upstream commit abba345311a740d9dca1b5eb293b3b1c296715dd ]

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: edf9dab8ba27 ("mt76: add 6GHz support")
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 5b53d008eb66485deb5db08ae70f85c2858c04f0..917ea20c026b4844185b280fd124a3028e1a72e4 100644 (file)
--- 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;