diff options
| author | Grazvydas Ignotas <notasas@gmail.com> | 2010-08-17 15:46:55 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-24 16:32:04 -0400 |
| commit | 7273b9700b74e8c26b612207aea47effb0e530bf (patch) | |
| tree | f1b8a54e4d4894002465d5a36fae8b97c691485e /drivers/net/wireless/wl12xx/wl1251_boot.c | |
| parent | 5b44a1b5164c69cb274215fc79a9f4f5a1203c4d (diff) | |
wl1251: wait for join command complete event
Poll for join command completion instead of waiting blindly for 10
msecs. There is a timeout of 100 msecs, if the command doesn't complete
by then, we return an error code.
Based on wl1271 patch 99d84c1de8fdf5f9b09f07fdbc628857a040bf8b
by Luciano Coelho.
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Acked-by: Kalle Valo <kvalo@adurom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1251_boot.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_boot.c b/drivers/net/wireless/wl12xx/wl1251_boot.c index 65e0416be5b6..5e65f47fda8a 100644 --- a/drivers/net/wireless/wl12xx/wl1251_boot.c +++ b/drivers/net/wireless/wl12xx/wl1251_boot.c | |||
| @@ -302,7 +302,7 @@ int wl1251_boot_run_firmware(struct wl1251 *wl) | |||
| 302 | ROAMING_TRIGGER_LOW_RSSI_EVENT_ID | | 302 | ROAMING_TRIGGER_LOW_RSSI_EVENT_ID | |
| 303 | ROAMING_TRIGGER_REGAINED_RSSI_EVENT_ID | | 303 | ROAMING_TRIGGER_REGAINED_RSSI_EVENT_ID | |
| 304 | REGAINED_BSS_EVENT_ID | BT_PTA_SENSE_EVENT_ID | | 304 | REGAINED_BSS_EVENT_ID | BT_PTA_SENSE_EVENT_ID | |
| 305 | BT_PTA_PREDICTION_EVENT_ID; | 305 | BT_PTA_PREDICTION_EVENT_ID | JOIN_EVENT_COMPLETE_ID; |
| 306 | 306 | ||
| 307 | ret = wl1251_event_unmask(wl); | 307 | ret = wl1251_event_unmask(wl); |
| 308 | if (ret < 0) { | 308 | if (ret < 0) { |