mac80211: don't reconfigure sched scan in case of wowlan

Scheduled scan has to be reconfigured only if wowlan wasn't
configured, since otherwise it should continue to run (with
the 'any' trigger) or be aborted.

The current code will end up asking the driver to start a new
scheduled scan without stopping the previous one, and leaking
some memory (from the previous request.)

Fix this by doing the abort/restart under the proper conditions.

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>

1 files changed, 23 insertions, 26 deletions

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 551164dabbaf..d38daf0181e8 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -2008,6 +2008,29 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                 if (ieee80211_sdata_running(sdata))
                         ieee80211_enable_keys(sdata);
 
+        /* Reconfigure sched scan if it was interrupted by FW restart */
+        mutex_lock(&local->mtx);
+        sched_scan_sdata = rcu_dereference_protected(local->sched_scan_sdata,
+                                                lockdep_is_held(&local->mtx));
+        sched_scan_req = rcu_dereference_protected(local->sched_scan_req,
+                                                lockdep_is_held(&local->mtx));
+        if (sched_scan_sdata && sched_scan_req)
+                /*
+                 * Sched scan stopped, but we don't want to report it. Instead,
+                 * we're trying to reschedule. However, if more than one scan
+                 * plan was set, we cannot reschedule since we don't know which
+                 * scan plan was currently running (and some scan plans may have
+                 * already finished).
+                 */
+                if (sched_scan_req->n_scan_plans > 1 ||
+                    __ieee80211_request_sched_scan_start(sched_scan_sdata,
+                                                         sched_scan_req))
+                        sched_scan_stopped = true;
+        mutex_unlock(&local->mtx);
+
+        if (sched_scan_stopped)
+                cfg80211_sched_scan_stopped_rtnl(local->hw.wiphy);
+
  wake_up:
         local->in_reconfig = false;
         barrier();
@@ -2043,32 +2066,6 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                                         false);
 
         /*
-         * Reconfigure sched scan if it was interrupted by FW restart or
-         * suspend.
-         */
-        mutex_lock(&local->mtx);
-        sched_scan_sdata = rcu_dereference_protected(local->sched_scan_sdata,
-                                                lockdep_is_held(&local->mtx));
-        sched_scan_req = rcu_dereference_protected(local->sched_scan_req,
-                                                lockdep_is_held(&local->mtx));
-        if (sched_scan_sdata && sched_scan_req)
-                /*
-                 * Sched scan stopped, but we don't want to report it. Instead,
-                 * we're trying to reschedule. However, if more than one scan
-                 * plan was set, we cannot reschedule since we don't know which
-                 * scan plan was currently running (and some scan plans may have
-                 * already finished).
-                 */
-                if (sched_scan_req->n_scan_plans > 1 ||
-                    __ieee80211_request_sched_scan_start(sched_scan_sdata,
-                                                         sched_scan_req))
-                        sched_scan_stopped = true;
-        mutex_unlock(&local->mtx);
-
-        if (sched_scan_stopped)
-                cfg80211_sched_scan_stopped_rtnl(local->hw.wiphy);
-
-        /*
          * If this is for hw restart things are still running.
          * We may want to change that later, however.
          */