mac80211: remove unneeded ieee80211_run_deferred_scan()

Ilan pointed out to me that ieee80211_start_next_roc()
already calls ieee80211_run_deferred_scan() if the list
of ROC items is empty, so there's no need to call it
again after calling ieee80211_start_next_roc().

Reported-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index f41f9bea242a70030c1e275bd0b86811253453b7..93d203cf8c12fc5badb5a96772440a1209786922 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2330,7 +2330,6 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local,
 
                list_del(&found->list);
 
-               ieee80211_run_deferred_scan(local);
                ieee80211_start_next_roc(local);
                mutex_unlock(&local->mtx);
 

diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index abb226dc4753f74e3902d309a9e93d51d38782de..fcb01ee8ee7bcb7ee9a546d324fb87ad57d266b9 100644 (file)
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -379,7 +379,6 @@ void ieee80211_sw_roc_work(struct work_struct *work)
                ieee80211_recalc_idle(local);
 
                ieee80211_start_next_roc(local);
-               ieee80211_run_deferred_scan(local);
        }
 
  out_unlock:
@@ -410,9 +409,6 @@ static void ieee80211_hw_roc_done(struct work_struct *work)
        /* if there's another roc, start it now */
        ieee80211_start_next_roc(local);
 
-       /* or scan maybe */
-       ieee80211_run_deferred_scan(local);
-
  out_unlock:
        mutex_unlock(&local->mtx);
 }
@@ -455,7 +451,6 @@ void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata)
        }
 
        ieee80211_start_next_roc(local);
-       ieee80211_run_deferred_scan(local);
        mutex_unlock(&local->mtx);
 
        list_for_each_entry_safe(roc, tmp, &tmp_list, list) {