aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-01-07 12:28:20 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:59:58 -0500
commit4be8c3873e0b88397866d3ede578503e188f9ad2 (patch)
tree1ccf8a0c204bb01aca08d90c2d8c37b5e0439bd3 /net/mac80211/tx.c
parentacbaf32e94cb70218792cac68e5149e482e77441 (diff)
mac80211: extend/document powersave API
This modifies hardware flags for powersave to support three different flags: * IEEE80211_HW_SUPPORTS_PS - indicates general PS support * IEEE80211_HW_PS_NULLFUNC_STACK - indicates nullfunc sending in software * IEEE80211_HW_SUPPORTS_DYNAMIC_PS - indicates dynamic PS on the device It also adds documentation for all this which explains how to set the various flags. Additionally, it fixes a few things: * a spot where && was used to test flags * enable CONF_PS only when associated again Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r--net/mac80211/tx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index b18a72690119..cd6bc87eec73 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1295,7 +1295,7 @@ int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
1295 return 0; 1295 return 0;
1296 } 1296 }
1297 1297
1298 if (!(local->hw.flags & IEEE80211_HW_NO_STACK_DYNAMIC_PS) && 1298 if ((local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK) &&
1299 local->hw.conf.dynamic_ps_timeout > 0) { 1299 local->hw.conf.dynamic_ps_timeout > 0) {
1300 if (local->hw.conf.flags & IEEE80211_CONF_PS) { 1300 if (local->hw.conf.flags & IEEE80211_CONF_PS) {
1301 ieee80211_stop_queues_by_reason(&local->hw, 1301 ieee80211_stop_queues_by_reason(&local->hw,