From 4ffc880d088fe503a99da53b44cc34d4b0004b9b Mon Sep 17 00:00:00 2001 From: Mehmet Akif Tasova Date: Fri, 13 Dec 2019 22:00:06 +0300 Subject: [PATCH] Revert "iwlwifi: mvm: fix scan config command size" Since Linux 5.4.1 released, iwlwifi could not initialize Intel(R) Dual Band Wireless AC 9462 firmware, failing with following error in dmesg: iwlwifi 0000:00:14.3: FW error in SYNC CMD SCAN_CFG_CMD whole dmesg output of error can be found at: https://gist.github.com/makiftasova/354e46439338f4ab3fba0b77ad5c19ec also bug report from ArchLinux bug tracker (contains more info): https://bugs.archlinux.org/task/64703 Reverting commit 06eb547c4ae4 ("iwlwifi: mvm: fix scan config command size") seems to fix this issue until proper solution is found. This reverts commit 06eb547c4ae4382e70d556ba213d13c95ca1801b. Signed-off-by: Mehmet Akif Tasova --- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index a046ac9fa852..a5af8f4128b1 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -1213,7 +1213,7 @@ static int iwl_mvm_legacy_config_scan(struct iwl_mvm *mvm) cmd_size = sizeof(struct iwl_scan_config_v2); else cmd_size = sizeof(struct iwl_scan_config_v1); - cmd_size += num_channels; + cmd_size += mvm->fw->ucode_capa.n_scan_channels; cfg = kzalloc(cmd_size, GFP_KERNEL); if (!cfg) -- 2.24.1