[4/6] mac80211: assure we also cancel deferred scan request

Commit Message

Stanislaw Gruszka Oct. 1, 2010, 12:05 p.m. UTC

None

Patch

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 494dba1..8ba09ff 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -304,8 +304,7 @@  static void ieee80211_restart_work(struct work_struct *work)
 	mutex_unlock(&local->mtx);
 
 	rtnl_lock();
-	if (unlikely(test_bit(SCAN_SW_SCANNING, &local->scanning)))
-		ieee80211_scan_cancel(local);
+	ieee80211_scan_cancel(local);
 	ieee80211_reconfig(local);
 	rtnl_unlock();
 }
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index ce671df..d287fde 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -12,8 +12,7 @@  int __ieee80211_suspend(struct ieee80211_hw *hw)
 	struct ieee80211_sub_if_data *sdata;
 	struct sta_info *sta;
 
-	if (unlikely(test_bit(SCAN_SW_SCANNING, &local->scanning)))
-		ieee80211_scan_cancel(local);
+	ieee80211_scan_cancel(local);
 
 	ieee80211_stop_queues_by_reason(hw,
 			IEEE80211_QUEUE_STOP_REASON_SUSPEND);
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 44deb05..2e9a70c 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -799,7 +799,7 @@  void ieee80211_scan_cancel(struct ieee80211_local *local)
 	 */
 	mutex_lock(&local->mtx);
 	if (test_bit(SCAN_SW_SCANNING, &local->scanning) ||
-	    (!local->scanning && local->scan_req))
+	    (!test_bit(SCAN_HW_SCANNING, &local->scanning) && local->scan_req))
 		finish = __ieee80211_scan_completed(&local->hw, true, false);
 	mutex_unlock(&local->mtx);