From: Luciano Coelho <luciano.coelho@xxxxxxxxx> It is possible that a deferred scan is queued after the queues are flushed in __ieee80211_suspend(). The deferred scan work may be scheduled by ROC or ieee80211_stop_poll(). To make sure don't start a new scan while suspending, check whether we're quiescing or suspended and complete the scan immediately if that's the case. Change-Id: I8ec2c8fb4d969833d45c77045b0f5594cc097086 Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx> Reviewed-on: https://gerrit.rds.intel.com/r/51405 Tested-by: IWL Jenkins Reviewed-by: Johannes Berg <johannes.berg@xxxxxxxxx> --- net/mac80211/scan.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 7807fa4..05f0d71 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -828,6 +828,11 @@ void ieee80211_scan_work(struct work_struct *work) mutex_lock(&local->mtx); + if (!ieee80211_can_run_worker(local)) { + aborted = true; + goto out_complete; + } + sdata = rcu_dereference_protected(local->scan_sdata, lockdep_is_held(&local->mtx)); scan_req = rcu_dereference_protected(local->scan_req, -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
