diff options
| author | Matt Chen <matt.chen@intel.com> | 2017-01-22 02:16:58 +0800 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-05-17 15:06:59 -0400 |
| commit | 1827f7e6062b7d620844d1c215b1aa34975dc2b1 (patch) | |
| tree | 4fd7a0695bd219b6a00cbd88637e0a80275bc2de /net | |
| parent | 0dad072cfc1df7b68677c7fb58455b68a35c41b5 (diff) | |
mac80211: flush delayed work when entering suspend
[ Upstream commit a9e9200d8661c1a0be8c39f93deb383dc940de35 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/pm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index ac6ad6238e3a..375fa4418736 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c @@ -140,6 +140,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); } |