1 files changed, 6 insertions, 0 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 6bcf0faa4a89..8190bf27ebff 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -248,6 +248,7 @@ static void ieee80211_restart_work(struct work_struct *work)
 
         /* wait for scan work complete */
         flush_workqueue(local->workqueue);
+        flush_work(&local->sched_scan_stopped_work);
 
         WARN(test_bit(SCAN_HW_SCANNING, &local->scanning),
              "%s called with hardware scan in progress\n", __func__);
@@ -256,6 +257,11 @@ static void ieee80211_restart_work(struct work_struct *work)
         list_for_each_entry(sdata, &local->interfaces, list)
                 flush_delayed_work(&sdata->dec_tailroom_needed_wk);
         ieee80211_scan_cancel(local);
+
+        /* make sure any new ROC will consider local->in_reconfig */
+        flush_delayed_work(&local->roc_work);
+        flush_work(&local->hw_roc_done);
+
         ieee80211_reconfig(local);
         rtnl_unlock();
 }