mt76: connac: remove PHY_MODE_AX_6G configuration in mt76_connac_get_phy_mode

Get rid of PHY_MODE_AX_6G configuration in mt76_connac_get_phy_mode
routine since mode is an u8 and PHY_MODE_AX_6G is set in phymode_ext
field in mt76_connac_bss_basic_tlv.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index bcb596664b3e9aa5ca000ee009db340fb04422ac..eba827f9979029201a040cf8f3f1a9f37d0b636e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -1190,12 +1190,8 @@ mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif,
                if (vht_cap->vht_supported)
                        mode |= PHY_MODE_AC;
 
-               if (he_cap && he_cap->has_he) {
-                       if (band == NL80211_BAND_6GHZ)
-                               mode |= PHY_MODE_AX_6G;
-                       else
-                               mode |= PHY_MODE_AX_5G;
-               }
+               if (he_cap && he_cap->has_he && band == NL80211_BAND_5GHZ)
+                       mode |= PHY_MODE_AX_5G;
        }
 
        return mode;
@@ -1318,7 +1314,7 @@ int mt76_connac_mcu_uni_add_bss(struct mt76_phy *phy,
        idx = mvif->omac_idx > EXT_BSSID_START ? HW_BSSID_0 : mvif->omac_idx;
        basic_req.basic.hw_bss_idx = idx;
        if (band == NL80211_BAND_6GHZ)
-               basic_req.basic.phymode_ext = BIT(0);
+               basic_req.basic.phymode_ext = PHY_MODE_AX_6G;
 
        basic_phy = mt76_connac_get_phy_mode_v2(phy, vif, band, NULL);
        basic_req.basic.nonht_basic_phy = cpu_to_le16(basic_phy);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index 4e2c9dafd7765694bbd750f1929095c6e6b2dc7b..388bfcef3b14ef475fa04beb17cfad4267c1227c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -423,7 +423,8 @@ enum {
 #define PHY_MODE_AC                            BIT(5)
 #define PHY_MODE_AX_24G                                BIT(6)
 #define PHY_MODE_AX_5G                         BIT(7)
-#define PHY_MODE_AX_6G                         BIT(8)
+
+#define PHY_MODE_AX_6G                         BIT(0) /* phymode_ext */
 
 #define MODE_CCK                               BIT(0)
 #define MODE_OFDM                              BIT(1)