Skip to content

Commit 0897fc6

Browse files
committed
wifi: iwlwifi: mvm: use already determined cmd_id
In iwl_mvm_rs_fw_rate_init() we have a variable cmd_id that holds the command ID, so we can just use that instead of the various calculations of it. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Link: https://msgid.link/20240506095953.f894ede03b26.I18f03c272b1c0807767f2713f3ffbb2941c57d9b@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent 950a3f5 commit 0897fc6

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

  • drivers/net/wireless/intel/iwlwifi/mvm

drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -654,10 +654,7 @@ void iwl_mvm_rs_fw_rate_init(struct iwl_mvm *mvm,
654654
*/
655655
sta->deflink.agg.max_amsdu_len = max_amsdu_len;
656656

657-
cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw,
658-
WIDE_ID(DATA_PATH_GROUP,
659-
TLC_MNG_CONFIG_CMD),
660-
0);
657+
cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw, cmd_id, 0);
661658
IWL_DEBUG_RATE(mvm, "TLC CONFIG CMD, sta_id=%d, max_ch_width=%d, mode=%d\n",
662659
cfg_cmd.sta_id, cfg_cmd.max_ch_width, cfg_cmd.mode);
663660
IWL_DEBUG_RATE(mvm, "TLC CONFIG CMD, chains=0x%X, ch_wid_supp=%d, flags=0x%X\n",
@@ -693,9 +690,7 @@ void iwl_mvm_rs_fw_rate_init(struct iwl_mvm *mvm,
693690
u16 cmd_size = sizeof(cfg_cmd_v3);
694691

695692
/* In old versions of the API the struct is 4 bytes smaller */
696-
if (iwl_fw_lookup_cmd_ver(mvm->fw,
697-
WIDE_ID(DATA_PATH_GROUP,
698-
TLC_MNG_CONFIG_CMD), 0) < 3)
693+
if (iwl_fw_lookup_cmd_ver(mvm->fw, cmd_id, 0) < 3)
699694
cmd_size -= 4;
700695

701696
ret = iwl_mvm_send_cmd_pdu(mvm, cmd_id, CMD_ASYNC, cmd_size,

0 commit comments

Comments
 (0)