summaryrefslogtreecommitdiffstats
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-01-06 18:13:18 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:59:56 -0500
commit46f2c4bd7e2ba2cfedbcd4fe15d316eebc608cba (patch)
tree70df1219af8e137032a01560e6ca8ac216dbf24c /net/mac80211/tx.c
parente9aeabaeb9a0bece50100dc74bbd720a68cb8f5c (diff)
downloadkernel-crypto-46f2c4bd7e2ba2cfedbcd4fe15d316eebc608cba.tar.gz
kernel-crypto-46f2c4bd7e2ba2cfedbcd4fe15d316eebc608cba.tar.xz
kernel-crypto-46f2c4bd7e2ba2cfedbcd4fe15d316eebc608cba.zip
mac80211: move dynamic PS timeout to hardware config
This will be needed for drivers that set the IEEE80211_HW_NO_STACK_DYNAMIC_PS flag and still want to handle dynamic PS. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Kalle Valo <kalle.valo@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r--net/mac80211/tx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 96eca341160..b18a7269011 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1296,7 +1296,7 @@ int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
}
if (!(local->hw.flags & IEEE80211_HW_NO_STACK_DYNAMIC_PS) &&
- local->dynamic_ps_timeout > 0) {
+ local->hw.conf.dynamic_ps_timeout > 0) {
if (local->hw.conf.flags & IEEE80211_CONF_PS) {
ieee80211_stop_queues_by_reason(&local->hw,
IEEE80211_QUEUE_STOP_REASON_PS);
@@ -1305,7 +1305,7 @@ int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
}
mod_timer(&local->dynamic_ps_timer, jiffies +
- msecs_to_jiffies(local->dynamic_ps_timeout));
+ msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout));
}
memset(info, 0, sizeof(*info));