path: root/net/mac80211/offchannel.c
diff options
authorJohannes Berg <johannes.berg@intel.com>2012-11-24 00:32:19 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-11-26 14:41:40 -0500
commit6bdd253f635f7b2ef027d116933a6c9ec148b87f (patch)
tree94bdbc7575eedf094c09e6f0948212cca2e7a8ee /net/mac80211/offchannel.c
parent53c5251366e7b815f76f92260b594446c94bd534 (diff)
mac80211: fix remain-on-channel (non-)cancelling
Felix Liao reported that when an interface is set DOWN while another interface is executing a ROC, the warning in ieee80211_start_next_roc() (about the first item on the list having started already) triggers. This is because ieee80211_roc_purge() calls it even if it never actually changed the list of ROC items. To fix this, simply remove the function call. If it is needed then it will be done by the ieee80211_sw_roc_work() function when the ROC item that is being removed while active is cleaned up. Cc: stable@vger.kernel.org Reported-by: Felix Liao <Felix.Liao@watchguard.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/offchannel.c')
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index 83608ac16780..2c84185dfdb0 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -458,8 +458,6 @@ void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata)
list_move_tail(&roc->list, &tmp_list);
roc->abort = true;
- ieee80211_start_next_roc(local);
list_for_each_entry_safe(roc, tmp, &tmp_list, list) {