diff options
author | Matt Chen <matt.chen@intel.com> | 2017-01-21 21:16:58 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-18 08:55:49 +0300 |
commit | 9d66db98966107dfebf3c960dff9ddae970fae86 (patch) | |
tree | beb18d8a528a9f333b0aae2fb4712c79189f8183 | |
parent | b05814a7b4552d54cbb6e32cfc4beef35b9bbc52 (diff) | |
download | linux-9d66db98966107dfebf3c960dff9ddae970fae86.tar.xz |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 4a95fe3cffbc..3b98c1b4a719 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c @@ -116,6 +116,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); } |