diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2020-01-17 16:13:47 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2020-01-17 16:13:47 +0200 |
| commit | 21bdee92c6f8a1609012c616a582001e09b3416d (patch) | |
| tree | f836e1f3def1fcf10d98f876afa6cbeb4d6f4c91 /drivers/net/wireless/intel/iwlwifi/mvm/scan.c | |
| parent | 33328bfab892d676920abb440d41fbf4b16c2717 (diff) | |
| parent | 205608749e1ef394f513888091e613c5bfccbcca (diff) | |
Merge tag 'iwlwifi-for-kalle-2020-01-11' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
First batch of fixes intended for v5.5
* Don't send the PPAG command when PPAG is disabled, since it can
cause problems;
* A few fixes for a HW bug;
* A fix for RS offload;
* A fix for 3168 devices where the NVM tables where the wrong tables
were being read.
* Fix a couple of potential memory leaks in TXQ code;
* Disable L0S states in all hardware since our hardware doesn't
officially support them anymore (and older versions of the hardware
had instability in these states);
* Remove lar_disable parameter since it has been causing issues for
some people who erroneously disable it;
* Force the debug monitor HW to stop also when debug is disabled,
since it sometimes stays on and prevents low system power states;
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/scan.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |