1 files changed, 9 insertions, 4 deletions

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index ae842678b629..05f0d711b6d8 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -416,7 +416,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local,
         ieee80211_offchannel_stop_vifs(local);
 
         /* ensure nullfunc is transmitted before leaving operating channel */
-        ieee80211_flush_queues(local, NULL);
+        ieee80211_flush_queues(local, NULL, false);
 
         ieee80211_configure_filter(local);
 
@@ -432,7 +432,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local,
 static bool ieee80211_can_scan(struct ieee80211_local *local,
                                struct ieee80211_sub_if_data *sdata)
 {
-        if (local->radar_detect_enabled)
+        if (ieee80211_is_radar_required(local))
                 return false;
 
         if (!list_empty(&local->roc_list))
@@ -505,7 +505,7 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata,
 
         lockdep_assert_held(&local->mtx);
 
-        if (local->scan_req)
+        if (local->scan_req || ieee80211_is_radar_required(local))
                 return -EBUSY;
 
         if (!ieee80211_can_scan(local, sdata)) {
@@ -805,7 +805,7 @@ static void ieee80211_scan_state_resume(struct ieee80211_local *local,
         ieee80211_offchannel_stop_vifs(local);
 
         if (local->ops->flush) {
-                ieee80211_flush_queues(local, NULL);
+                ieee80211_flush_queues(local, NULL, false);
                 *next_delay = 0;
         } else
                 *next_delay = HZ / 10;
@@ -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,