Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150127
b: refs/heads/master
c: d5edaed
h: refs/heads/master
i:
  150125: fbfbb26
  150123: da77c09
  150119: 10abeb8
  150111: c20a904
v: v3
  • Loading branch information
Johannes Berg authored and John W. Linville committed May 6, 2009
1 parent f873984 commit 8624209
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0e41f715c04f85a40ae6531d660be2241717be1c
refs/heads/master: d5edaedc16ebd0635435dec068d49e07a76ba7d9
7 changes: 7 additions & 0 deletions trunk/net/mac80211/mlme.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
return;

if (conf->dynamic_ps_timeout > 0 &&
!(local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_PS)) {
mod_timer(&local->dynamic_ps_timer, jiffies +
Expand Down

0 comments on commit 8624209

Please sign in to comment.