diff options
| author | Matt Chen <matt.chen@intel.com> | 2017-01-22 02:16:58 +0800 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-07-04 11:51:38 +0200 |
| commit | f17739cdeb937502fec0ef81775f2b51b602f9c6 (patch) | |
| tree | 31d765946e3c453f562775f40d1ee2b2e589f49e /net/mac80211 | |
| parent | 38088437f5e667253a6953c192e70090b3d26531 (diff) | |
mac80211: flush delayed work when entering suspend
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: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'net/mac80211')
| -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 efb510e6f..a1f47b8d8 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); } |