summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-11-30 11:27:32 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-11-30 11:27:32 -0500
commit9f8933e960f98d27742727445061b0ece934e5cf (patch)
treef8e54b3769e1503dff50d86367e8fd324ce0322f /net
parente196c0e579902f42cf72414461fb034e5a1ffbf7 (diff)
parent6bdd253f635f7b2ef027d116933a6c9ec148b87f (diff)
downloadlinux-stable-9f8933e960f98d27742727445061b0ece934e5cf.tar.gz
linux-stable-9f8933e960f98d27742727445061b0ece934e5cf.tar.bz2
linux-stable-9f8933e960f98d27742727445061b0ece934e5cf.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/offchannel.c2
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);
mutex_unlock(&local->mtx);
list_for_each_entry_safe(roc, tmp, &tmp_list, list) {