Skip to content

Commit 9175f32

Browse files
committed
wifi: iwlwifi: mld: remove support of roc cmd version 5
The last FW API that supports version 5 is 97. Since this API is no longer supported on 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.e53bd8553360.I6978c216b52b818b879d076a85c5f9edafcf2e99@changeid
1 parent d243f5c commit 9175f32

File tree

1 file changed

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

1 file changed

+2
-8
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@ int iwl_mld_start_roc(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
8282
struct iwl_roc_req cmd = {
8383
.action = cpu_to_le32(FW_CTXT_ACTION_ADD),
8484
};
85-
u8 ver = iwl_fw_lookup_cmd_ver(mld->fw,
86-
WIDE_ID(MAC_CONF_GROUP, ROC_CMD), 0);
87-
u16 cmd_len = ver < 6 ? sizeof(struct iwl_roc_req_v5) : sizeof(cmd);
8885
enum iwl_roc_activity activity;
8986
int ret = 0;
9087

@@ -140,7 +137,7 @@ int iwl_mld_start_roc(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
140137
memcpy(cmd.node_addr, vif->addr, ETH_ALEN);
141138

142139
ret = iwl_mld_send_cmd_pdu(mld, WIDE_ID(MAC_CONF_GROUP, ROC_CMD),
143-
&cmd, cmd_len);
140+
&cmd);
144141
if (ret) {
145142
IWL_ERR(mld, "Couldn't send the ROC_CMD\n");
146143
return ret;
@@ -190,9 +187,6 @@ int iwl_mld_cancel_roc(struct ieee80211_hw *hw,
190187
struct iwl_roc_req cmd = {
191188
.action = cpu_to_le32(FW_CTXT_ACTION_REMOVE),
192189
};
193-
u8 ver = iwl_fw_lookup_cmd_ver(mld->fw,
194-
WIDE_ID(MAC_CONF_GROUP, ROC_CMD), 0);
195-
u16 cmd_len = ver < 6 ? sizeof(struct iwl_roc_req_v5) : sizeof(cmd);
196190
int ret;
197191

198192
lockdep_assert_wiphy(mld->wiphy);
@@ -208,7 +202,7 @@ int iwl_mld_cancel_roc(struct ieee80211_hw *hw,
208202
cmd.activity = cpu_to_le32(mld_vif->roc_activity);
209203

210204
ret = iwl_mld_send_cmd_pdu(mld, WIDE_ID(MAC_CONF_GROUP, ROC_CMD),
211-
&cmd, cmd_len);
205+
&cmd);
212206
if (ret)
213207
IWL_ERR(mld, "Couldn't send the command to cancel the ROC\n");
214208

0 commit comments

Comments
 (0)