diff options
Diffstat (limited to 'drivers/net/wireless/wl12xx/ps.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/ps.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/wl12xx/ps.c b/drivers/net/wireless/wl12xx/ps.c index c15ebf2efd40..ac3f20716f5b 100644 --- a/drivers/net/wireless/wl12xx/ps.c +++ b/drivers/net/wireless/wl12xx/ps.c | |||
@@ -143,8 +143,8 @@ out: | |||
143 | return 0; | 143 | return 0; |
144 | } | 144 | } |
145 | 145 | ||
146 | int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode, | 146 | int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif, |
147 | u32 rates, bool send) | 147 | enum wl1271_cmd_ps_mode mode, u32 rates, bool send) |
148 | { | 148 | { |
149 | int ret; | 149 | int ret; |
150 | 150 | ||
@@ -152,13 +152,13 @@ int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode, | |||
152 | case STATION_POWER_SAVE_MODE: | 152 | case STATION_POWER_SAVE_MODE: |
153 | wl1271_debug(DEBUG_PSM, "entering psm"); | 153 | wl1271_debug(DEBUG_PSM, "entering psm"); |
154 | 154 | ||
155 | ret = wl1271_acx_wake_up_conditions(wl); | 155 | ret = wl1271_acx_wake_up_conditions(wl, wlvif); |
156 | if (ret < 0) { | 156 | if (ret < 0) { |
157 | wl1271_error("couldn't set wake up conditions"); | 157 | wl1271_error("couldn't set wake up conditions"); |
158 | return ret; | 158 | return ret; |
159 | } | 159 | } |
160 | 160 | ||
161 | ret = wl1271_cmd_ps_mode(wl, STATION_POWER_SAVE_MODE); | 161 | ret = wl1271_cmd_ps_mode(wl, wlvif, STATION_POWER_SAVE_MODE); |
162 | if (ret < 0) | 162 | if (ret < 0) |
163 | return ret; | 163 | return ret; |
164 | 164 | ||
@@ -170,17 +170,17 @@ int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode, | |||
170 | 170 | ||
171 | /* disable beacon early termination */ | 171 | /* disable beacon early termination */ |
172 | if (wl->band == IEEE80211_BAND_2GHZ) { | 172 | if (wl->band == IEEE80211_BAND_2GHZ) { |
173 | ret = wl1271_acx_bet_enable(wl, false); | 173 | ret = wl1271_acx_bet_enable(wl, wlvif, false); |
174 | if (ret < 0) | 174 | if (ret < 0) |
175 | return ret; | 175 | return ret; |
176 | } | 176 | } |
177 | 177 | ||
178 | /* disable beacon filtering */ | 178 | /* disable beacon filtering */ |
179 | ret = wl1271_acx_beacon_filter_opt(wl, false); | 179 | ret = wl1271_acx_beacon_filter_opt(wl, wlvif, false); |
180 | if (ret < 0) | 180 | if (ret < 0) |
181 | return ret; | 181 | return ret; |
182 | 182 | ||
183 | ret = wl1271_cmd_ps_mode(wl, STATION_ACTIVE_MODE); | 183 | ret = wl1271_cmd_ps_mode(wl, wlvif, STATION_ACTIVE_MODE); |
184 | if (ret < 0) | 184 | if (ret < 0) |
185 | return ret; | 185 | return ret; |
186 | 186 | ||