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>
This commit is contained in:
Johannes Berg
2009-01-06 18:13:18 +01:00
zatwierdzone przez John W. Linville
rodzic e9aeabaeb9
commit 46f2c4bd7e
5 zmienionych plików z 20 dodań i 15 usunięć

Wyświetl plik

@@ -863,17 +863,19 @@ static int ieee80211_ioctl_siwpower(struct net_device *dev,
timeout = wrq->value / 1000;
set:
if (ps == local->powersave && timeout == local->dynamic_ps_timeout)
if (ps == local->powersave && timeout == conf->dynamic_ps_timeout)
return ret;
local->powersave = ps;
local->dynamic_ps_timeout = timeout;
conf->dynamic_ps_timeout = timeout;
if (!(local->hw.flags & IEEE80211_HW_NO_STACK_DYNAMIC_PS) &&
(sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED)) {
if (local->dynamic_ps_timeout > 0)
if (local->hw.flags & IEEE80211_HW_NO_STACK_DYNAMIC_PS) {
ret = ieee80211_hw_config(local,
IEEE80211_CONF_CHANGE_DYNPS_TIMEOUT);
} else if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) {
if (conf->dynamic_ps_timeout > 0)
mod_timer(&local->dynamic_ps_timer, jiffies +
msecs_to_jiffies(local->dynamic_ps_timeout));
msecs_to_jiffies(conf->dynamic_ps_timeout));
else {
if (local->powersave) {
ieee80211_send_nullfunc(local, sdata, 1);