From 5b3efe4a4793207aff4f4649b2f424e62e29a1ed Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Sun, 2 Sep 2012 13:30:04 +0300 Subject: [PATCH] --- yaml --- r: 328358 b: refs/heads/master c: ab2c4f37dcef5bd517a95a32da50d5ed0cc24cb5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ti/wlcore/ps.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 94c3f388e62d..8e0fd5ec2664 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f8d6b20bb0bdda333e781faf775db14cb4660dd +refs/heads/master: ab2c4f37dcef5bd517a95a32da50d5ed0cc24cb5 diff --git a/trunk/drivers/net/wireless/ti/wlcore/ps.c b/trunk/drivers/net/wireless/ti/wlcore/ps.c index e904d68767e2..4d1414a673fb 100644 --- a/trunk/drivers/net/wireless/ti/wlcore/ps.c +++ b/trunk/drivers/net/wireless/ti/wlcore/ps.c @@ -28,7 +28,7 @@ #define WL1271_WAKEUP_TIMEOUT 500 -#define ELP_ENTRY_DELAY 5 +#define ELP_ENTRY_DELAY 30 void wl1271_elp_work(struct work_struct *work) { @@ -98,11 +98,7 @@ 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; - + timeout = ELP_ENTRY_DELAY; ieee80211_queue_delayed_work(wl->hw, &wl->elp_work, msecs_to_jiffies(timeout)); }