aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/cmd.c
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@nokia.com>2009-06-12 14:15:46 +0300
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 14:57:46 -0400
commit9f483dc3d1b0b1695c8177c1dea2e721954b10fb (patch)
tree000c5b1f96725d60815105c134ebaa1cbea3628b /drivers/net/wireless/wl12xx/cmd.c
parent052a625a859ceba68022862eeee70511f56483a5 (diff)
downloadkernel_samsung_smdk4412-9f483dc3d1b0b1695c8177c1dea2e721954b10fb.zip
kernel_samsung_smdk4412-9f483dc3d1b0b1695c8177c1dea2e721954b10fb.tar.gz
kernel_samsung_smdk4412-9f483dc3d1b0b1695c8177c1dea2e721954b10fb.tar.bz2
wl12xx: pass the wake up condition when configuring the wake up event
Changed the function wl12xx_acx_wake_up_conditions() so that it receives an argument with the actual wake up condition, instead of having WAKE_UP_EVENT_DTIM_BITMAP hardcoded. This is needed because we have to use different conditions in 1271. Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: Kalle Valo <kalle.valo@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/cmd.c')
-rw-r--r--drivers/net/wireless/wl12xx/cmd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c
index 0a02cdd..d98941a 100644
--- a/drivers/net/wireless/wl12xx/cmd.c
+++ b/drivers/net/wireless/wl12xx/cmd.c
@@ -346,7 +346,8 @@ int wl12xx_cmd_ps_mode(struct wl12xx *wl, u8 ps_mode)
int ret = 0;
/* FIXME: this should be in ps.c */
- ret = wl12xx_acx_wake_up_conditions(wl, wl->listen_int);
+ ret = wl12xx_acx_wake_up_conditions(wl, WAKE_UP_EVENT_DTIM_BITMAP,
+ wl->listen_int);
if (ret < 0) {
wl12xx_error("couldn't set wake up conditions");
goto out;