summaryrefslogtreecommitdiffstats
path: root/net/mac80211/offchannel.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-06-11 11:34:18 +0200
committerJohannes Berg <johannes.berg@intel.com>2012-06-11 17:01:17 +0200
commitcef28271be62e672637f1ba2a019a5a9a981eb2d (patch)
treeadac86044e382aa5acd2782fe9b4c0ee000bd0e6 /net/mac80211/offchannel.c
parenta4f606ea73d56d15f28653d2242e54d58bb612e5 (diff)
downloadop-kernel-dev-cef28271be62e672637f1ba2a019a5a9a981eb2d.zip
op-kernel-dev-cef28271be62e672637f1ba2a019a5a9a981eb2d.tar.gz
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>
Diffstat (limited to 'net/mac80211/offchannel.c')
-rw-r--r--net/mac80211/offchannel.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index abb226d..fcb01ee 100644
--- 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) {
OpenPOWER on IntegriCloud