From 36d9b148502674c0760585b598c9b2c4dda59ccf Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 11 Jun 2012 11:34:18 +0200 Subject: [PATCH] --- yaml --- r: 314803 b: refs/heads/master c: cef28271be62e672637f1ba2a019a5a9a981eb2d h: refs/heads/master i: 314801: cc67a9915469bb0850ab3eececc4d5c579d653cd 314799: 94cbe54f0b1ed8d466f3e40427ef4ccbfdc54418 v: v3 --- [refs] | 2 +- trunk/net/mac80211/cfg.c | 1 - trunk/net/mac80211/offchannel.c | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8c9001dd41a6..8bbc44bd328d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4f606ea73d56d15f28653d2242e54d58bb612e5 +refs/heads/master: cef28271be62e672637f1ba2a019a5a9a981eb2d diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c index f41f9bea242a..93d203cf8c12 100644 --- a/trunk/net/mac80211/cfg.c +++ b/trunk/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/trunk/net/mac80211/offchannel.c b/trunk/net/mac80211/offchannel.c index abb226dc4753..fcb01ee8ee7b 100644 --- a/trunk/net/mac80211/offchannel.c +++ b/trunk/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) {