From: David Spinadel <david.spinadel@intel.com>
Date: Sun, 10 Nov 2013 13:42:08 +0000 (+0200)
Subject: iwlwifi: mvm: don't stop sched scan in restart
X-Git-Tag: next-20140306~62^2~218^2~55
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=df8fe3aed04a158ea657724209081c8322f8eac1;p=karo-tx-linux.git

iwlwifi: mvm: don't stop sched scan in restart

Don't stop scheduled scan before reporting HW restart;
mac80211 was changed to reschedule it after reconfigure.

Signed-off-by: David Spinadel <david.spinadel@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---

diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c
index 5e4d56ed88a4..734b022d339a 100644
--- a/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@ -760,7 +760,7 @@ static void iwl_mvm_nic_restart(struct iwl_mvm *mvm)
 			ieee80211_scan_completed(mvm->hw, true);
 			break;
 		case IWL_MVM_SCAN_SCHED:
-			ieee80211_sched_scan_stopped(mvm->hw);
+			/* Sched scan will be restarted by mac80211. */
 			break;
 		}