aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1251_cmd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1251_cmd.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_cmd.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.c b/drivers/net/wireless/wl12xx/wl1251_cmd.c
index 9cd46ce88e51..e276cb5f5be7 100644
--- a/drivers/net/wireless/wl12xx/wl1251_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1251_cmd.c
@@ -252,7 +252,7 @@ out:
252} 252}
253 253
254int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u16 beacon_interval, 254int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u16 beacon_interval,
255 u8 dtim_interval, bool wait) 255 u8 dtim_interval)
256{ 256{
257 unsigned long timeout; 257 unsigned long timeout;
258 struct cmd_join *join; 258 struct cmd_join *join;
@@ -273,10 +273,9 @@ int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u16 beacon_interval,
273 if (ret < 0) 273 if (ret < 0)
274 goto out; 274 goto out;
275 275
276 wl1251_debug(DEBUG_CMD, "cmd join%s %d %d%s", 276 wl1251_debug(DEBUG_CMD, "cmd join%s %d %d",
277 bss_type == BSS_TYPE_IBSS ? " ibss" : "", 277 bss_type == BSS_TYPE_IBSS ? " ibss" : "",
278 beacon_interval, dtim_interval, 278 beacon_interval, dtim_interval);
279 wait ? " wait" : "");
280 279
281 /* Reverse order BSSID */ 280 /* Reverse order BSSID */
282 bssid = (u8 *) &join->bssid_lsb; 281 bssid = (u8 *) &join->bssid_lsb;
@@ -307,8 +306,7 @@ int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u16 beacon_interval,
307 * ugly hack: we should wait for JOIN_EVENT_COMPLETE_ID but to 306 * ugly hack: we should wait for JOIN_EVENT_COMPLETE_ID but to
308 * simplify locking we just sleep instead, for now 307 * simplify locking we just sleep instead, for now
309 */ 308 */
310 if (wait) 309 msleep(10);
311 msleep(10);
312 310
313out: 311out:
314 kfree(join); 312 kfree(join);