Skip to content

Commit

Permalink
wlcore: use the original elp time in forced_ps mode
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eliad Peller authored and Luciano Coelho committed Jun 5, 2012
1 parent d35dc73 commit 1ab0f21
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion drivers/net/wireless/ti/wlcore/ps.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@

#define WL1271_WAKEUP_TIMEOUT 500

#define ELP_ENTRY_DELAY 5

void wl1271_elp_work(struct work_struct *work)
{
struct delayed_work *dwork;
Expand Down Expand Up @@ -72,6 +74,7 @@ void wl1271_elp_work(struct work_struct *work)
void wl1271_ps_elp_sleep(struct wl1271 *wl)
{
struct wl12xx_vif *wlvif;
u32 timeout;

if (wl->quirks & WLCORE_QUIRK_NO_ELP)
return;
Expand All @@ -89,8 +92,13 @@ void wl1271_ps_elp_sleep(struct wl1271 *wl)
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,
msecs_to_jiffies(wl->conf.conn.dynamic_ps_timeout));
msecs_to_jiffies(timeout));
}

int wl1271_ps_elp_wakeup(struct wl1271 *wl)
Expand Down

0 comments on commit 1ab0f21

Please sign in to comment.