lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wl1251: move wl1251_acx_wake_up_conditions() to wl1251_ps_set_mode()

Browse Source 
It should not be hidden inside wl1251_cmd_ps_mode().

Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Reviewed-by: Vidhya Govindan <vidhya.govindan@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Kalle Valo
2009-08-07 13:34:56 +03:00
committed by John W. Linville
parent fe9a98460b
commit 4a8189227f
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/wl12xx/wl1251_cmd.c
View File

@@ -301,14 +301,6 @@ int wl1251_cmd_ps_mode(struct wl1251 *wl, u8 ps_mode)
struct wl1251_cmd_ps_params *ps_params = NULL; struct wl1251_cmd_ps_params *ps_params = NULL;
int ret = 0; int ret = 0;
/* FIXME: this should be in ps.c */
ret = wl1251_acx_wake_up_conditions(wl, WAKE_UP_EVENT_DTIM_BITMAP,
wl->listen_int);
if (ret < 0) {
wl1251_error("couldn't set wake up conditions");
goto out;
}
wl1251_debug(DEBUG_CMD, "cmd set ps mode"); wl1251_debug(DEBUG_CMD, "cmd set ps mode");
ps_params = kzalloc(sizeof(*ps_params), GFP_KERNEL); ps_params = kzalloc(sizeof(*ps_params), GFP_KERNEL);

13
drivers/net/wireless/wl12xx/wl1251_ps.c
View File

@@ -118,6 +118,13 @@ int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_cmd_ps_mode mode)
switch (mode) { switch (mode) {
case STATION_POWER_SAVE_MODE: case STATION_POWER_SAVE_MODE:
wl1251_debug(DEBUG_PSM, "entering psm"); wl1251_debug(DEBUG_PSM, "entering psm");
ret = wl1251_acx_wake_up_conditions(wl,
WAKE_UP_EVENT_DTIM_BITMAP,
wl->listen_int);
if (ret < 0)
return ret;
ret = wl1251_cmd_ps_mode(wl, STATION_POWER_SAVE_MODE); ret = wl1251_cmd_ps_mode(wl, STATION_POWER_SAVE_MODE);
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -135,6 +142,12 @@ int wl1251_ps_set_mode(struct wl1251 *wl, enum wl1251_cmd_ps_mode mode)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = wl1251_acx_wake_up_conditions(wl,
WAKE_UP_EVENT_DTIM_BITMAP,
wl->listen_int);
if (ret < 0)
return ret;
ret = wl1251_cmd_ps_mode(wl, STATION_ACTIVE_MODE); ret = wl1251_cmd_ps_mode(wl, STATION_ACTIVE_MODE);
if (ret < 0) if (ret < 0)
return ret; return ret;