openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

wl1271: wait for disconnect command complete event 

Wait for the DISCONNECT_EVENT_COMPLETE_ID event after sending a disconnect
command.

Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luciano Coelho 2010-03-26 12:53:21 +02:00 committed by John W. Linville
parent 99d84c1de8
commit 2f826f5540
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/wl12xx/wl1271_boot.c
View File

@ -1,7 +1,7 @@
/* /*
* This file is part of wl1271 * This file is part of wl1271
* *
* Copyright (C) 2008-2009 Nokia Corporation * Copyright (C) 2008-2010 Nokia Corporation
* *
* Contact: Luciano Coelho <luciano.coelho@nokia.com> * Contact: Luciano Coelho <luciano.coelho@nokia.com>
* *
@ -411,7 +411,8 @@ static int wl1271_boot_run_firmware(struct wl1271 *wl)
wl->event_mask = BSS_LOSE_EVENT_ID | wl->event_mask = BSS_LOSE_EVENT_ID |
SCAN_COMPLETE_EVENT_ID | SCAN_COMPLETE_EVENT_ID |
PS_REPORT_EVENT_ID | PS_REPORT_EVENT_ID |
JOIN_EVENT_COMPLETE_ID; JOIN_EVENT_COMPLETE_ID |
DISCONNECT_EVENT_COMPLETE_ID;
ret = wl1271_event_unmask(wl); ret = wl1271_event_unmask(wl);
if (ret < 0) { if (ret < 0) {

6
drivers/net/wireless/wl12xx/wl1271_cmd.c
View File

@ -1,7 +1,7 @@
/* /*
* This file is part of wl1271 * This file is part of wl1271
* *
* Copyright (C) 2009 Nokia Corporation * Copyright (C) 2009-2010 Nokia Corporation
* *
* Contact: Luciano Coelho <luciano.coelho@nokia.com> * Contact: Luciano Coelho <luciano.coelho@nokia.com>
* *
@ -942,6 +942,10 @@ int wl1271_cmd_disconnect(struct wl1271 *wl)
goto out_free; goto out_free;
} }
ret = wl1271_cmd_wait_for_event(wl, DISCONNECT_EVENT_COMPLETE_ID);
if (ret < 0)
wl1271_error("cmd disconnect event completion error");
out_free: out_free:
kfree(cmd); kfree(cmd);