summaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2017-10-09 14:32:35 +0800
committerAlex Shi <alex.shi@linaro.org>2017-10-09 14:32:35 +0800
commitfb687505984514536ca50a9344dd6128b2181a18 (patch)
tree4f2be9321503ebfbcd8b4f8b3bc53cad806f9754 /net/mac80211
parenta759573d34fc8249c416857e15cf8d0fd9c99d1a (diff)
parent11c5615ee573326a1ea6cdff116bf0057934d5d1 (diff)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/offchannel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index 04401037140e..b6be51940ead 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -469,6 +469,8 @@ void ieee80211_roc_purge(struct ieee80211_local *local,
struct ieee80211_roc_work *roc, *tmp;
LIST_HEAD(tmp_list);
+ flush_work(&local->hw_roc_start);
+
mutex_lock(&local->mtx);
list_for_each_entry_safe(roc, tmp, &local->roc_list, list) {
if (sdata && roc->sdata != sdata)