Commit d5edaedc authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: fix PS vs. scan race

When somebody changes the PS parameters while scanning
is in progress, we enable PS -- during the scan. This
is clearly not desirable, and we can just abort enabling
PS when scanning since when the scan finishes it will
be taken care of.
Signed-off-by: default avatarJohannes Berg <>
Reviewed-by: default avatarKalle Valo <>
Signed-off-by: default avatarJohn W. Linville <>
parent 0e41f715
......@@ -487,6 +487,13 @@ static void ieee80211_enable_ps(struct ieee80211_local *local,
struct ieee80211_conf *conf = &local->hw.conf;
* If we are scanning right now then the parameters will
* take effect when scan finishes.
if (local->hw_scanning || local->sw_scanning)
if (conf->dynamic_ps_timeout > 0 &&
!(local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_PS)) {
mod_timer(&local->dynamic_ps_timer, jiffies +
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment