iwlwifi: mvm: inform mac80211 about umac scans that was aborted by restart

In nic restart flow we inform mac80211 that scan was aborted, but it was
based only on scan_status which is not set by UMAC scan. Fix that.

Signed-off-by: David Spinadel <david.spinadel@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

1 files changed, 1 insertions, 12 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c
index 80121e41ca22..a28080ead54f 100644
--- a/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@ -894,18 +894,7 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)
          * the next start() call from mac80211. If restart isn't called
          * (no fw restart) scan status will stay busy.
          */
-        switch (mvm->scan_status) {
-        case IWL_MVM_SCAN_NONE:
-                break;
-        case IWL_MVM_SCAN_OS:
-                ieee80211_scan_completed(mvm->hw, true);
-                break;
-        case IWL_MVM_SCAN_SCHED:
-                /* Sched scan will be restarted by mac80211 in restart_hw. */
-                if (!mvm->restart_fw)
-                        ieee80211_sched_scan_stopped(mvm->hw);
-                break;
-        }
+        iwl_mvm_report_scan_aborted(mvm);
 
         /*
          * If we're restarting already, don't cycle restarts.