summaryrefslogtreecommitdiff
path: root/net/mac80211/cfg.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/cfg.c
parenta4f606ea73d56d15f28653d2242e54d58bb612e5 (diff)
downloadlinux-3.10-cef28271be62e672637f1ba2a019a5a9a981eb2d.tar.gz
linux-3.10-cef28271be62e672637f1ba2a019a5a9a981eb2d.tar.bz2
linux-3.10-cef28271be62e672637f1ba2a019a5a9a981eb2d.zip
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/cfg.c')
-rw-r--r--net/mac80211/cfg.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index f41f9bea242..93d203cf8c1 100644
--- 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);