Messages in this thread Patch in this message | | | From | Jiri Slaby <> | Subject | [PATCH 3.12 56/60] mac80211: flush delayed work when entering suspend | Date | Tue, 14 Mar 2017 14:15:47 +0100 |
| |
From: Matt Chen <matt.chen@intel.com>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
commit a9e9200d8661c1a0be8c39f93deb383dc940de35 upstream.
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.
Signed-off-by: Matt Chen <matt.chen@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Jiri Slaby <jslaby@suse.cz> --- net/mac80211/pm.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index efb510e6f206..a1f47b8d8013 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c @@ -114,6 +114,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); } -- 2.12.0
| |