aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/cfg.c1
-rw-r--r--net/mac80211/offchannel.c5
2 files changed, 0 insertions, 6 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index f41f9bea242a..93d203cf8c12 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2330,7 +2330,6 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local,
2330 2330
2331 list_del(&found->list); 2331 list_del(&found->list);
2332 2332
2333 ieee80211_run_deferred_scan(local);
2334 ieee80211_start_next_roc(local); 2333 ieee80211_start_next_roc(local);
2335 mutex_unlock(&local->mtx); 2334 mutex_unlock(&local->mtx);
2336 2335
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index abb226dc4753..fcb01ee8ee7b 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -379,7 +379,6 @@ void ieee80211_sw_roc_work(struct work_struct *work)
379 ieee80211_recalc_idle(local); 379 ieee80211_recalc_idle(local);
380 380
381 ieee80211_start_next_roc(local); 381 ieee80211_start_next_roc(local);
382 ieee80211_run_deferred_scan(local);
383 } 382 }
384 383
385 out_unlock: 384 out_unlock:
@@ -410,9 +409,6 @@ static void ieee80211_hw_roc_done(struct work_struct *work)
410 /* if there's another roc, start it now */ 409 /* if there's another roc, start it now */
411 ieee80211_start_next_roc(local); 410 ieee80211_start_next_roc(local);
412 411
413 /* or scan maybe */
414 ieee80211_run_deferred_scan(local);
415
416 out_unlock: 412 out_unlock:
417 mutex_unlock(&local->mtx); 413 mutex_unlock(&local->mtx);
418} 414}
@@ -455,7 +451,6 @@ void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata)
455 } 451 }
456 452
457 ieee80211_start_next_roc(local); 453 ieee80211_start_next_roc(local);
458 ieee80211_run_deferred_scan(local);
459 mutex_unlock(&local->mtx); 454 mutex_unlock(&local->mtx);
460 455
461 list_for_each_entry_safe(roc, tmp, &tmp_list, list) { 456 list_for_each_entry_safe(roc, tmp, &tmp_list, list) {