diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2021-02-05 11:06:39 +0200 |
|---|---|---|
| committer | Luca Coelho <luciano.coelho@intel.com> | 2021-02-05 11:56:45 +0200 |
| commit | d8cf2cfa9746a5b3fec5e72a801e4283b03ad84e (patch) | |
| tree | b25e22f37bf0fb2057b6743a1b0c7efd95a59833 /drivers/net/wireless/intel/iwlwifi/mvm/scan.c | |
| parent | 7f9c3bc465b20245c11a2455ed2770d02b0adf4c (diff) | |
| download | linux-d8cf2cfa9746a5b3fec5e72a801e4283b03ad84e.tar.gz linux-d8cf2cfa9746a5b3fec5e72a801e4283b03ad84e.tar.bz2 linux-d8cf2cfa9746a5b3fec5e72a801e4283b03ad84e.zip | |
iwlwifi: mvm: cancel the scan delayed work when scan is aborted
When we abort the scan because of a firmware crash, we
need to cancel the delayed work that monitors the scan
completion. Otherwise it'll kick and try to restart the
firmware yet another time.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210205110447.a497faa942dd.Ibc155ad36da9de7eb0ddcdd826ddf8dd6607d2ac@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/scan.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index e89f4f1e44c6..42e790ed8caa 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -2854,6 +2854,8 @@ void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm) .aborted = true, }; + cancel_delayed_work(&mvm->scan_timeout_dwork); + ieee80211_scan_completed(mvm->hw, &info); mvm->scan_uid_status[uid] = 0; } @@ -2894,6 +2896,7 @@ void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm) .aborted = true, }; + cancel_delayed_work(&mvm->scan_timeout_dwork); ieee80211_scan_completed(mvm->hw, &info); } |