]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
mac80211: flush delayed work when entering suspend
authorMatt Chen <matt.chen@intel.com>
Sat, 21 Jan 2017 18:16:58 +0000 (02:16 +0800)
committerTim Gardner <tim.gardner@canonical.com>
Wed, 15 Mar 2017 15:32:11 +0000 (10:32 -0500)
commit9b27335ba6dcd231c450989f0185b23152ee218c
tree53e92a738cd6c39d6834708c07f5974bbbe60d13
parent9eb1e67249d70cbbc7c5108476443429fd7dc49c
mac80211: flush delayed work when entering suspend

BugLink: http://bugs.launchpad.net/bugs/1673118
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>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
net/mac80211/pm.c