summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatt Chen <matt.chen@intel.com>2017-01-22 02:16:58 +0800
committerJohannes Berg <johannes.berg@intel.com>2017-02-27 14:00:26 +0100
commita9e9200d8661c1a0be8c39f93deb383dc940de35 (patch)
tree67263b807e7dfbae1a4e9aa28721720a95a987cc /net
parent0328edc77d4f35014b35f32b46be0a7e16aae74f (diff)
downloadlinux-a9e9200d8661c1a0be8c39f93deb383dc940de35.tar.gz
linux-a9e9200d8661c1a0be8c39f93deb383dc940de35.tar.bz2
linux-a9e9200d8661c1a0be8c39f93deb383dc940de35.zip
mac80211: flush delayed work when entering suspend
The issue was found when entering suspend and resume. It triggers a warning in: mac80211/key.c: ieee80211_enable_keys() ... WARN_ON_ONCE(sdata->crypto_tx_tailroom_needed_cnt || sdata->crypto_tx_tailroom_pending_dec); ... It points out sdata->crypto_tx_tailroom_pending_dec isn't cleaned up successfully in a delayed_work during suspend. Add a flush_delayed_work to fix it. Cc: stable@vger.kernel.org Signed-off-by: Matt Chen <matt.chen@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/pm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index 28a3a0957c9e..76a8bcd8ef11 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -168,6 +168,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
break;
}
+ flush_delayed_work(&sdata->dec_tailroom_needed_wk);
drv_remove_interface(local, sdata);
}