From a7207dffdf6e3e05bad7dead57d3b91bfd559a9e Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 13 Jul 2012 16:14:45 +0200 Subject: [PATCH] --- yaml --- r: 315573 b: refs/heads/master c: 4b4b8229aeff4ca09b4aee921d383c596146eca0 h: refs/heads/master i: 315571: 54ec2e6d86a9df9dc418e2be87673a70e50c20b7 v: v3 --- [refs] | 2 +- trunk/net/mac80211/offchannel.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ace954678409..2ab0b754b8a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae33bd817a10f39174453b754e9b548132acae4a +refs/heads/master: 4b4b8229aeff4ca09b4aee921d383c596146eca0 diff --git a/trunk/net/mac80211/offchannel.c b/trunk/net/mac80211/offchannel.c index 8c047fc8b325..635c3250c668 100644 --- a/trunk/net/mac80211/offchannel.c +++ b/trunk/net/mac80211/offchannel.c @@ -324,6 +324,7 @@ void ieee80211_sw_roc_work(struct work_struct *work) container_of(work, struct ieee80211_roc_work, work.work); struct ieee80211_sub_if_data *sdata = roc->sdata; struct ieee80211_local *local = sdata->local; + bool started; mutex_lock(&local->mtx); @@ -366,9 +367,10 @@ void ieee80211_sw_roc_work(struct work_struct *work) /* finish this ROC */ finish: list_del(&roc->list); + started = roc->started; ieee80211_roc_notify_destroy(roc); - if (roc->started) { + if (started) { drv_flush(local, false); local->tmp_channel = NULL; @@ -379,7 +381,7 @@ void ieee80211_sw_roc_work(struct work_struct *work) ieee80211_recalc_idle(local); - if (roc->started) + if (started) ieee80211_start_next_roc(local); }