Commit dfdf6725 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

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: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent e4fce22b

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c

+3 −7
Original line number Diff line number Diff line
@@ -1190,13 +1190,9 @@ 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

		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);

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h

+2 −1
Original line number Diff line number Diff line
@@ -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)