diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2010-09-07 17:38:15 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2010-09-08 10:49:46 -0700 |
| commit | 82e23ced93c37e8e4113876052ea8caedd31c7ca (patch) | |
| tree | fdab104588bf33845862b25460f0d8a0793a4c2d | |
| parent | 5ab21644405f96d4803912181bbc6b86668af13c (diff) | |
| download | wpa_supplicant_6-82e23ced93c37e8e4113876052ea8caedd31c7ca.tar.gz | |
Remove "old scan" call in case of combo-scan failure (DO NOT MERGE)
Change-Id: Iaa9004622f5bfd075fa775804a450ca9addd1ad1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | wpa_supplicant/src/drivers/driver_wext.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/wpa_supplicant/src/drivers/driver_wext.c b/wpa_supplicant/src/drivers/driver_wext.c index 1185af9..8d8b8b3 100644 --- a/wpa_supplicant/src/drivers/driver_wext.c +++ b/wpa_supplicant/src/drivers/driver_wext.c @@ -1253,20 +1253,11 @@ int wpa_driver_wext_combo_scan(void *priv, struct wpa_ssid **ssid_ptr, if ((ret = ioctl(drv->ioctl_sock, SIOCSIWPRIV, &iwr)) < 0) { wpa_printf(MSG_ERROR, "ioctl[SIOCSIWPRIV] (cscan): %d", ret); *ssid_ptr = ssid_orig; - goto old_scan; } wpa_driver_wext_set_scan_timeout(priv); return ret; - -old_scan: - if (*ssid_ptr) { - ssid_nm = (*ssid_ptr)->ssid; - ssid_len = (*ssid_ptr)->ssid_len; - } - - return wpa_driver_wext_scan(priv, ssid_nm, ssid_len); } |