diff options
author | 2025-06-25 10:19:39 +0200 | |
---|---|---|
committer | 2025-06-25 10:20:03 +0200 | |
commit | 95b922dd04f74a45fb86b34a25cda62f427a2b5c (patch) | |
tree | a3cadb810bd1461b4f3a42aaed1100ef7d0e7b92 | |
parent | wifi: mac80211: finish link init before RCU publish (diff) | |
parent | wifi: iwlwifi: mvm: assume '1' as the default mac_config_cmd version (diff) | |
download | wireguard-linux-95b922dd04f74a45fb86b34a25cda62f427a2b5c.tar.xz wireguard-linux-95b922dd04f74a45fb86b34a25cda62f427a2b5c.zip |
Merge tag 'iwlwifi-fixes-2025-06-25' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Miri Korenblit says:
====================
iwlwifi-fixes: fix failure in interface up
====================
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c index 3c255ae916c8..3f8b840871d3 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c @@ -32,9 +32,9 @@ static void iwl_mvm_mld_mac_ctxt_cmd_common(struct iwl_mvm *mvm, unsigned int link_id; int cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw, WIDE_ID(MAC_CONF_GROUP, - MAC_CONFIG_CMD), 0); + MAC_CONFIG_CMD), 1); - if (WARN_ON(cmd_ver < 1 || cmd_ver > 3)) + if (WARN_ON(cmd_ver > 3)) return; cmd->id_and_color = cpu_to_le32(mvmvif->id); |