| Message ID | 20191231083604.5639-1-jian-hong@endlessm.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | iwlwifi: mvm: Revert "iwlwifi: mvm: fix scan config command size" | expand |
On Tue, 2019-12-31 at 16:36 +0800, Jian-Hong Pan wrote: > The Intel(R) Dual Band Wireless AC 9461 WiFi keeps restarting until > commit 06eb547c4ae4 ("wlwifi: mvm: fix scan config command size") is > reverted. > > Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=206025 > Fixes: commit 06eb547c4ae4 ("wlwifi: mvm: fix scan config command size") > Signed-off-by: Jian-Hong Pan <jian-hong@endlessm.com> > --- We already have this fix queued up for v5.5-rc*: https://patchwork.kernel.org/patch/11313069/ Thanks for the patch anyway! -- Cheers, Luca.
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)
The Intel(R) Dual Band Wireless AC 9461 WiFi keeps restarting until commit 06eb547c4ae4 ("wlwifi: mvm: fix scan config command size") is reverted. Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=206025 Fixes: commit 06eb547c4ae4 ("wlwifi: mvm: fix scan config command size") Signed-off-by: Jian-Hong Pan <jian-hong@endlessm.com> --- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)