mt76: mt7915: fix IEEE80211_HE_PHY_CAP7_MAX_NC for station mode
authorRyder Lee <ryder.lee@mediatek.com>
Fri, 11 Jun 2021 18:04:20 +0000 (02:04 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Jul 2021 07:44:51 +0000 (09:44 +0200)
[ Upstream commit 2707ff4dd7b1479dbd44ebb3c74788084cc95245 ]

The value of station mode is always 0.

Fixed: 00b2e16e0063 ("mt76: mt7915: add TxBF capabilities")
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/mediatek/mt76/mt7915/init.c

index 0232b66..8f01ca1 100644 (file)
@@ -335,6 +335,9 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap,
        if (nss < 2)
                return;
 
+       /* the maximum cap is 4 x 3, (Nr, Nc) = (3, 2) */
+       elem->phy_cap_info[7] |= min_t(int, nss - 1, 2) << 3;
+
        if (vif != NL80211_IFTYPE_AP)
                return;
 
@@ -348,9 +351,6 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap,
        c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB |
            IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB;
        elem->phy_cap_info[6] |= c;
-
-       /* the maximum cap is 4 x 3, (Nr, Nc) = (3, 2) */
-       elem->phy_cap_info[7] |= min_t(int, nss - 1, 2) << 3;
 }
 
 static void