diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-11 19:13:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-11 19:13:08 -0400 |
| commit | 78d41b35a9570b7a9a45686789df5dfaeb2b7f4c (patch) | |
| tree | a28432584132a7c810b6b243795aec43544205ab /net | |
| parent | 9bbc052d5e63512b0ce4e201ea97e12fba9fda82 (diff) | |
| parent | 2ae1b8b35faba31a59b153cbad07f9c15de99740 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/tx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index ce4596ed1268..bd1224fd216a 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
| @@ -237,6 +237,10 @@ ieee80211_tx_h_dynamic_ps(struct ieee80211_tx_data *tx) | |||
| 237 | &local->dynamic_ps_disable_work); | 237 | &local->dynamic_ps_disable_work); |
| 238 | } | 238 | } |
| 239 | 239 | ||
| 240 | /* Don't restart the timer if we're not disassociated */ | ||
| 241 | if (!ifmgd->associated) | ||
| 242 | return TX_CONTINUE; | ||
| 243 | |||
| 240 | mod_timer(&local->dynamic_ps_timer, jiffies + | 244 | mod_timer(&local->dynamic_ps_timer, jiffies + |
| 241 | msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout)); | 245 | msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout)); |
| 242 | 246 | ||