diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2009-11-18 17:53:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-18 17:53:33 -0800 |
| commit | 1514919a5d81d42c028e8037acde43db9f55c380 (patch) | |
| tree | c2ca9b07a045b95660fb60c0802554ae8281afd5 | |
| parent | 9411648b74d6f08947228975ebe2d687dff87c55 (diff) | |
| parent | 4a37ed949c6f6793d5539a5fb22c389e2a023f8b (diff) | |
| download | ti-1514919a5d81d42c028e8037acde43db9f55c380.tar.gz | |
am 4a37ed94: am 1052ba99: tnetw1271: Add scan timeout handling
Merge commit '4a37ed949c6f6793d5539a5fb22c389e2a023f8b'
* commit '4a37ed949c6f6793d5539a5fb22c389e2a023f8b':
tnetw1271: Add scan timeout handling
| -rw-r--r-- | wilink_6_1/wpa_supplicant_lib/driver_ti.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/wilink_6_1/wpa_supplicant_lib/driver_ti.c b/wilink_6_1/wpa_supplicant_lib/driver_ti.c index 55198c5..ce8e19d 100644 --- a/wilink_6_1/wpa_supplicant_lib/driver_ti.c +++ b/wilink_6_1/wpa_supplicant_lib/driver_ti.c @@ -260,7 +260,7 @@ static int wpa_driver_tista_scan( void *priv, const u8 *ssid, size_t ssid_len ) struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)(drv->ctx); struct wpa_ssid *issid; scan_Params_t scanParams; - int scan_type, res, scan_probe_flag = 0; + int scan_type, res, timeout, scan_probe_flag = 0; wpa_printf(MSG_DEBUG, "%s", __func__); TI_CHECK_DRIVER( drv->driver_is_loaded, -1 ); @@ -298,6 +298,12 @@ static int wpa_driver_tista_scan( void *priv, const u8 *ssid, size_t ssid_len ) else wpa_printf(MSG_DEBUG, "wpa_driver_tista_scan success"); + timeout = 30; + wpa_printf(MSG_DEBUG, "Scan requested (ret=%d) - scan timeout %d sec", + res, timeout); + eloop_cancel_timeout(wpa_driver_wext_scan_timeout, drv->wext, drv->ctx); + eloop_register_timeout(timeout, 0, wpa_driver_wext_scan_timeout, + drv->wext, drv->ctx); return res; #else return wpa_driver_wext_scan(drv->wext, ssid, ssid_len); |