mac80211: avoid ROC during hw restart

Defer ROC requests during hw restart, as the driver
might not be fully configured in this stage (e.g.
channel contexts were not added yet)

Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

3 files changed, 18 insertions, 2 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 6bcf0faa4a89..ed4c8e66b44a 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -256,6 +256,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();
 }
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index fbc34e9088de..55a9c5b94ce1 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -408,6 +408,10 @@ void ieee80211_start_next_roc(struct ieee80211_local *local)
                 return;
         }
 
+        /* defer roc if driver is not started (i.e. during reconfig) */
+        if (local->in_reconfig)
+                return;
+
         roc = list_first_entry(&local->roc_list, struct ieee80211_roc_work,
                                list);
 
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 3943d4bf289c..4f6e0b79ef69 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -2051,8 +2051,15 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                 cfg80211_sched_scan_stopped_rtnl(local->hw.wiphy);
 
  wake_up:
-        local->in_reconfig = false;
-        barrier();
+        if (local->in_reconfig) {
+                local->in_reconfig = false;
+                barrier();
+
+                /* Restart deferred ROCs */
+                mutex_lock(&local->mtx);
+                ieee80211_start_next_roc(local);
+                mutex_unlock(&local->mtx);
+        }
 
         if (local->monitors == local->open_count && local->monitors > 0)
                 ieee80211_add_virtual_monitor(local);