diff options
author | Luciano Coelho <luciano.coelho@nokia.com> | 2009-06-12 07:15:46 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-10 14:57:46 -0400 |
commit | 9f483dc3d1b0b1695c8177c1dea2e721954b10fb (patch) | |
tree | 000c5b1f96725d60815105c134ebaa1cbea3628b /drivers/net/wireless/wl12xx/acx.c | |
parent | 052a625a859ceba68022862eeee70511f56483a5 (diff) |
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/acx.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/acx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/acx.c b/drivers/net/wireless/wl12xx/acx.c index d0daf69558f0..a6b894573f08 100644 --- a/drivers/net/wireless/wl12xx/acx.c +++ b/drivers/net/wireless/wl12xx/acx.c | |||
@@ -96,7 +96,8 @@ out: | |||
96 | return ret; | 96 | return ret; |
97 | } | 97 | } |
98 | 98 | ||
99 | int wl12xx_acx_wake_up_conditions(struct wl12xx *wl, u8 listen_interval) | 99 | int wl12xx_acx_wake_up_conditions(struct wl12xx *wl, u8 wake_up_event, |
100 | u8 listen_interval) | ||
100 | { | 101 | { |
101 | struct acx_wake_up_condition *wake_up; | 102 | struct acx_wake_up_condition *wake_up; |
102 | int ret; | 103 | int ret; |
@@ -109,7 +110,7 @@ int wl12xx_acx_wake_up_conditions(struct wl12xx *wl, u8 listen_interval) | |||
109 | goto out; | 110 | goto out; |
110 | } | 111 | } |
111 | 112 | ||
112 | wake_up->wake_up_event = WAKE_UP_EVENT_DTIM_BITMAP; | 113 | wake_up->wake_up_event = wake_up_event; |
113 | wake_up->listen_interval = listen_interval; | 114 | wake_up->listen_interval = listen_interval; |
114 | 115 | ||
115 | ret = wl12xx_cmd_configure(wl, ACX_WAKE_UP_CONDITIONS, | 116 | ret = wl12xx_cmd_configure(wl, ACX_WAKE_UP_CONDITIONS, |