Skip to content

Commit ed56d01

Browse files
committed
wifi: iwlwifi: mvm: fix a crash on 7265
jira LE-2157 Rebuild_History Non-Buildable kernel-5.14.0-503.14.1.el9_5 commit-author Emmanuel Grumbach <emmanuel.grumbach@intel.com> commit 788e4c7 Since IWL_FW_CMD_VER_UNKNOWN = 99, then my change to consider cmd_ver >= 7 instead of cmd_ver = 7 included also firmwares that don't advertise the command version at all. This made us send a command with a bad size and because of that, the firmware hit a BAD_COMMAND immediately after handling the REDUCE_TX_POWER_CMD command. Fixes: 8f892e2 ("wifi: iwlwifi: mvm: support iwl_dev_tx_power_cmd_v8") Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Reviewed-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Link: https://msgid.link/20240512072733.eb20ff5050d3.Ie4fc6f5496cd296fd6ff20d15e98676f28a3cccd@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com> (cherry picked from commit 788e4c7) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent b3f3a73 commit ed56d01

File tree

1 file changed

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

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -884,8 +884,8 @@ int iwl_mvm_sar_select_profile(struct iwl_mvm *mvm, int prof_a, int prof_b)
884884
int ret;
885885
u16 len = 0;
886886
u32 n_subbands;
887-
u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw, cmd_id,
888-
IWL_FW_CMD_VER_UNKNOWN);
887+
u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw, cmd_id, 3);
888+
889889
if (cmd_ver >= 7) {
890890
len = sizeof(cmd.v7);
891891
n_subbands = IWL_NUM_SUB_BANDS_V2;

0 commit comments

Comments
 (0)