aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>2010-04-27 12:47:40 +0300
committerJohn W. Linville <linville@tuxdriver.com>2010-04-27 16:09:22 -0400
commit195e294d21e88af879da4f88db2ceeb4ec28a755 (patch)
tree22a75db60cc8743888054460db85eb9a76b0cecb /include/net
parent3a37495268ab45507b4cab9d4cb18c5496ab7a10 (diff)
downloadkernel_samsung_aries-195e294d21e88af879da4f88db2ceeb4ec28a755.zip
kernel_samsung_aries-195e294d21e88af879da4f88db2ceeb4ec28a755.tar.gz
kernel_samsung_aries-195e294d21e88af879da4f88db2ceeb4ec28a755.tar.bz2
mac80211: Determine dynamic PS timeout based on ps-qos network latency
Determine the dynamic PS timeout based on the configured ps-qos network latency. For backwards wext compatibility, allow the dynamic PS timeout configured by the cfg80211 to overrule the automatically determined value. Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/mac80211.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 7dc5a67..c26de6c 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -668,6 +668,9 @@ enum ieee80211_smps_mode {
* @dynamic_ps_timeout: The dynamic powersave timeout (in ms), see the
* powersave documentation below. This variable is valid only when
* the CONF_PS flag is set.
+ * @dynamic_ps_forced_timeout: The dynamic powersave timeout (in ms) configured
+ * by cfg80211 (essentially, wext) If set, this value overrules the value
+ * chosen by mac80211 based on ps qos network latency.
*
* @power_level: requested transmit power (in dBm)
*
@@ -687,7 +690,7 @@ enum ieee80211_smps_mode {
*/
struct ieee80211_conf {
u32 flags;
- int power_level, dynamic_ps_timeout;
+ int power_level, dynamic_ps_timeout, dynamic_ps_forced_timeout;
int max_sleep_period;
u16 listen_interval;