Skip to contentSkip to conversation

Patch "mac80211: flush delayed work when entering suspend" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Mar 12, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

mac80211: flush delayed work when entering suspend

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mac80211-flush-delayed-work-when-entering-suspend.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From a9e9200d8661c1a0be8c39f93deb383dc940de35 Mon Sep 17 00:00:00 2001

From: Matt Chen <[email protected]>
Date: Sun, 22 Jan 2017 02:16:58 +0800
Subject: mac80211: flush delayed work when entering suspend

From: Matt Chen <[email protected]>

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.

---
 net/mac80211/pm.c |    1 +
 1 file changed, 1 insertion(+)
net/mac80211/pm.c +1 -0
@@ -168,6 +168,7 @@ int __ieee80211_suspend(struct ieee80211
 			break;
 		}
 
+		flush_delayed_work(&sdata->dec_tailroom_needed_wk);
 		drv_remove_interface(local, sdata);
 	}
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/mac80211-flush-delayed-work-when-entering-suspend.patch