diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-17 23:33:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-17 23:33:11 +0200 |
| commit | 9cbc94eabb0791906051bbfac024ef2c2be8e079 (patch) | |
| tree | 41ba194e687c6c60f5c883f98737ac83257d0c00 /net/mac80211/tx.c | |
| parent | ipv4: Don't use enums as bitmasks in ip_fragment.c (diff) | |
| parent | net: ethtool: fix IPV6 checksum feature name string (diff) | |
| download | linux-9cbc94eabb0791906051bbfac024ef2c2be8e079.tar.xz linux-9cbc94eabb0791906051bbfac024ef2c2be8e079.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/vmxnet3/vmxnet3_ethtool.c
net/core/dev.c
Diffstat (limited to 'net/mac80211/tx.c')
| -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 6eeaaa2bbafe..64e0f7587e6d 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) &local->dynamic_ps_disable_work); } + /* Don't restart the timer if we're not disassociated */ + if (!ifmgd->associated) + return TX_CONTINUE; + mod_timer(&local->dynamic_ps_timer, jiffies + msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout)); |