Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ab0f212 authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wlcore: use the original elp time in forced_ps mode 



The dynamic PS timeout is meaningless in forced PS mode.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent d35dc739

drivers/net/wireless/ti/wlcore/ps.c

+9 −1
Original line number Original line Diff line number Diff line
@@ -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 @@ void wl1271_elp_work(struct work_struct *work) 
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)