diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2010-09-13 10:23:29 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2010-09-13 14:12:02 -0700 |
| commit | 8c1176a8ea7784cb58de75a50ea156f018d5b495 (patch) | |
| tree | 9a464a5fcaa9bda4d465ee815f923bf0b91160cb | |
| parent | f25ee84c8c39dfef58231aa4ef24d5b1fab6c6ac (diff) | |
| download | wpa_supplicant_6-8c1176a8ea7784cb58de75a50ea156f018d5b495.tar.gz | |
resolved conflicts for merge of 7d3085c6 to master
WEXT: cscan: Return Ok in case driver was stopped
Change-Id: I01d8bcc751878c7e307ec476cb9b948970cad0fa
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | wpa_supplicant/src/drivers/driver_wext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wpa_supplicant/src/drivers/driver_wext.c b/wpa_supplicant/src/drivers/driver_wext.c index d091a45..8c28c1a 100644 --- a/wpa_supplicant/src/drivers/driver_wext.c +++ b/wpa_supplicant/src/drivers/driver_wext.c @@ -1206,8 +1206,8 @@ int wpa_driver_wext_combo_scan(void *priv, struct wpa_ssid **ssid_ptr, int scan_probe_flag = 0; if (!drv->driver_is_started) { - wpa_printf(MSG_ERROR, "%s: Driver stopped", __func__); - return -1; + wpa_printf(MSG_DEBUG, "%s: Driver stopped", __func__); + return 0; } wpa_printf(MSG_ERROR, "%s: Start", __func__); |