aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivek Natarajan <vivek.natraj@gmail.com>2008-12-23 18:28:34 -0800
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:58:48 -0500
commit869717fbe43eb831cbebd03a9a66a4a4c3b406a9 (patch)
tree606022280750e9427784a5fcb246ff7ea1e37f24
parentd063ed0f0cd623b45edc6f4781dda6478c56bb4f (diff)
mac80211: A couple of fixes to dynamic power save.
a) hw_config() should not be called from siwpower() for the drivers which do not support dynamic powersave. b) IEEE80211_HW_NO_STACK_DYNAMIC_PS needs to be verified in set_associated() also before enabling the power save timers. Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/mlme.c3
-rw-r--r--net/mac80211/wext.c9
2 files changed, 7 insertions, 5 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index b688425d755..b3c99d3c61b 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -751,7 +751,8 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
bss_info_changed |= BSS_CHANGED_BASIC_RATES;
ieee80211_bss_info_change_notify(sdata, bss_info_changed);
- if (local->powersave) {
+ if (local->powersave &&
+ !(local->hw.flags & IEEE80211_HW_NO_STACK_DYNAMIC_PS)) {
if (local->dynamic_ps_timeout > 0)
mod_timer(&local->dynamic_ps_timer, jiffies +
msecs_to_jiffies(local->dynamic_ps_timeout));
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 011592fd452..8568f1e7266 100644
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -865,9 +865,9 @@ set:
local->powersave = ps;
local->dynamic_ps_timeout = timeout;
- if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) {
- if (!(local->hw.flags & IEEE80211_HW_NO_STACK_DYNAMIC_PS) &&
- local->dynamic_ps_timeout > 0)
+ if (!(local->hw.flags & IEEE80211_HW_NO_STACK_DYNAMIC_PS) &&
+ (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED)) {
+ if (local->dynamic_ps_timeout > 0)
mod_timer(&local->dynamic_ps_timer, jiffies +
msecs_to_jiffies(local->dynamic_ps_timeout));
else {
@@ -875,8 +875,9 @@ set:
conf->flags |= IEEE80211_CONF_PS;
else
conf->flags &= ~IEEE80211_CONF_PS;
+ ret = ieee80211_hw_config(local,
+ IEEE80211_CONF_CHANGE_PS);
}
- ret = ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
}
return ret;