leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wlcore: use the original elp time in forced_ps mode

Browse Source 
The dynamic PS timeout is meaningless in forced PS mode.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
This commit is contained in:
Eliad Peller
2012-05-15 17:08:52 +03:00
committed by Luciano Coelho
parent d35dc739f6
commit 1ab0f21262
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/ti/wlcore/ps.c
View File

@@ -28,6 +28,8 @@
#define WL1271_WAKEUP_TIMEOUT 500 #define WL1271_WAKEUP_TIMEOUT 500
#define ELP_ENTRY_DELAY 5
void wl1271_elp_work(struct work_struct *work) void wl1271_elp_work(struct work_struct *work)
{ {
struct delayed_work *dwork; struct delayed_work *dwork;
@@ -72,6 +74,7 @@ out:
void wl1271_ps_elp_sleep(struct wl1271 *wl) void wl1271_ps_elp_sleep(struct wl1271 *wl)
{ {
struct wl12xx_vif *wlvif; struct wl12xx_vif *wlvif;
u32 timeout;
if (wl->quirks & WLCORE_QUIRK_NO_ELP) if (wl->quirks & WLCORE_QUIRK_NO_ELP)
return; return;
@@ -89,8 +92,13 @@ void wl1271_ps_elp_sleep(struct wl1271 *wl)
return; return;
} }
if (wl->conf.conn.forced_ps)
timeout = ELP_ENTRY_DELAY;
else
timeout = wl->conf.conn.dynamic_ps_timeout;
ieee80211_queue_delayed_work(wl->hw, &wl->elp_work, ieee80211_queue_delayed_work(wl->hw, &wl->elp_work,
msecs_to_jiffies(wl->conf.conn.dynamic_ps_timeout)); msecs_to_jiffies(timeout));
} }
int wl1271_ps_elp_wakeup(struct wl1271 *wl) int wl1271_ps_elp_wakeup(struct wl1271 *wl)