Skip to content

Commit d243f5c

Browse files
committed
wifi: iwlwifi: mld: remove support of mac cmd ver 2
The last FW API that supported ver 2 is API 99 (core 96) Since we no longer support it in any device that loads iwlmld, we can remove support of it. Reviewed-by: Emmanuel Grumbach <[email protected]> Signed-off-by: Miri Korenblit <[email protected]> Link: https://patch.msgid.link/20250909061931.a56bf370d31a.Ie1e93654ce9ee52e6ae3fda9bc898d611456ec41@changeid
1 parent e5e8d86 commit d243f5c

File tree

1 file changed

+8
-22
lines changed
  • drivers/net/wireless/intel/iwlwifi/mld

1 file changed

+8
-22
lines changed

drivers/net/wireless/intel/iwlwifi/mld/iface.c

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -115,20 +115,12 @@ static bool iwl_mld_is_nic_ack_enabled(struct iwl_mld *mld,
115115

116116
static void iwl_mld_set_he_support(struct iwl_mld *mld,
117117
struct ieee80211_vif *vif,
118-
struct iwl_mac_config_cmd *cmd,
119-
int cmd_ver)
118+
struct iwl_mac_config_cmd *cmd)
120119
{
121-
if (vif->type == NL80211_IFTYPE_AP) {
122-
if (cmd_ver == 2)
123-
cmd->wifi_gen_v2.he_ap_support = cpu_to_le16(1);
124-
else
125-
cmd->wifi_gen.he_ap_support = 1;
126-
} else {
127-
if (cmd_ver == 2)
128-
cmd->wifi_gen_v2.he_support = cpu_to_le16(1);
129-
else
130-
cmd->wifi_gen.he_support = 1;
131-
}
120+
if (vif->type == NL80211_IFTYPE_AP)
121+
cmd->wifi_gen.he_ap_support = 1;
122+
else
123+
cmd->wifi_gen.he_support = 1;
132124
}
133125

134126
/* fill the common part for all interface types */
@@ -140,9 +132,6 @@ static void iwl_mld_mac_cmd_fill_common(struct iwl_mld *mld,
140132
struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);
141133
struct ieee80211_bss_conf *link_conf;
142134
unsigned int link_id;
143-
int cmd_ver = iwl_fw_lookup_cmd_ver(mld->fw,
144-
WIDE_ID(MAC_CONF_GROUP,
145-
MAC_CONFIG_CMD), 0);
146135

147136
lockdep_assert_wiphy(mld->wiphy);
148137

@@ -169,19 +158,16 @@ static void iwl_mld_mac_cmd_fill_common(struct iwl_mld *mld,
169158
* and enable both when we have MLO.
170159
*/
171160
if (ieee80211_vif_is_mld(vif)) {
172-
iwl_mld_set_he_support(mld, vif, cmd, cmd_ver);
173-
if (cmd_ver == 2)
174-
cmd->wifi_gen_v2.eht_support = cpu_to_le32(1);
175-
else
176-
cmd->wifi_gen.eht_support = 1;
161+
iwl_mld_set_he_support(mld, vif, cmd);
162+
cmd->wifi_gen.eht_support = 1;
177163
return;
178164
}
179165

180166
for_each_vif_active_link(vif, link_conf, link_id) {
181167
if (!link_conf->he_support)
182168
continue;
183169

184-
iwl_mld_set_he_support(mld, vif, cmd, cmd_ver);
170+
iwl_mld_set_he_support(mld, vif, cmd);
185171

186172
/* EHT, if supported, was already set above */
187173
break;

0 commit comments

Comments
 (0)