summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/scan.c
diff options
context:
space:
mode:
authorDavid Spinadel2014-01-09 13:22:55 +0100
committerEmmanuel Grumbach2014-02-03 21:23:34 +0100
commit992f81fcd97e87e7ebbb26e544430adf483203f0 (patch)
treed7649ff1ec208de79f281d5ca722d35692764fef /drivers/net/wireless/iwlwifi/mvm/scan.c
parentiwlwifi: mvm: don't stop sched scan in restart (diff)
downloadkernel-qcow2-linux-992f81fcd97e87e7ebbb26e544430adf483203f0.tar.gz
kernel-qcow2-linux-992f81fcd97e87e7ebbb26e544430adf483203f0.tar.xz
kernel-qcow2-linux-992f81fcd97e87e7ebbb26e544430adf483203f0.zip
iwlwifi: mvm: notify scan completed even if no fw_restart
Notify scan completed if fw_restart flow isn't going to be run. Otherwise, the scan will stay stack forever and mac80211 will not be able to remove the interface. Signed-off-by: David Spinadel <david.spinadel@intel.com> Reviewed-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/scan.c')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 0e0007960612..6c5c17397f7e 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -487,7 +487,7 @@ void iwl_mvm_cancel_scan(struct iwl_mvm *mvm)
ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_CMD, CMD_SYNC, 0, NULL);
if (ret) {
IWL_ERR(mvm, "Couldn't send SCAN_ABORT_CMD: %d\n", ret);
- /* mac80211's state will be cleaned in the fw_restart flow */
+ /* mac80211's state will be cleaned in the nic_restart flow */
goto out_remove_notif;
}