Commit 9175f32e authored by Miri Korenblit's avatar Miri Korenblit
Browse files

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: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250909061931.e53bd8553360.I6978c216b52b818b879d076a85c5f9edafcf2e99@changeid
parent d243f5c1

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

+2 −8
Original line number Diff line number Diff line
@@ -82,9 +82,6 @@ int iwl_mld_start_roc(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	struct iwl_roc_req cmd = {

		.action = cpu_to_le32(FW_CTXT_ACTION_ADD),

	};

	u8 ver = iwl_fw_lookup_cmd_ver(mld->fw,

				       WIDE_ID(MAC_CONF_GROUP, ROC_CMD), 0);

	u16 cmd_len = ver < 6 ? sizeof(struct iwl_roc_req_v5) : sizeof(cmd);

	enum iwl_roc_activity activity;

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



	ret = iwl_mld_send_cmd_pdu(mld, WIDE_ID(MAC_CONF_GROUP, ROC_CMD),

				   &cmd, cmd_len);

				   &cmd);

	if (ret) {

		IWL_ERR(mld, "Couldn't send the ROC_CMD\n");

		return ret;
@@ -190,9 +187,6 @@ int iwl_mld_cancel_roc(struct ieee80211_hw *hw, 
	struct iwl_roc_req cmd = {

		.action = cpu_to_le32(FW_CTXT_ACTION_REMOVE),

	};

	u8 ver = iwl_fw_lookup_cmd_ver(mld->fw,

				       WIDE_ID(MAC_CONF_GROUP, ROC_CMD), 0);

	u16 cmd_len = ver < 6 ? sizeof(struct iwl_roc_req_v5) : sizeof(cmd);

	int ret;



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



	ret = iwl_mld_send_cmd_pdu(mld, WIDE_ID(MAC_CONF_GROUP, ROC_CMD),

				   &cmd, cmd_len);

				   &cmd);

	if (ret)

		IWL_ERR(mld, "Couldn't send the command to cancel the ROC\n");