diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2010-11-08 14:03:19 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2010-11-08 14:03:19 -0800 |
| commit | a3a0d9c0aface678403648c4e723537475e40e41 (patch) | |
| tree | 24487478698337f1a87c666cf39e50d8a4ce6c3f | |
| parent | b5540e961dc9c5290b9cb118fd4a51770ca8f776 (diff) | |
| download | wpa_supplicant_6-a3a0d9c0aface678403648c4e723537475e40e41.tar.gz | |
Fix combo-scan prev SSID pointer update in case of scan failure
Change-Id: Ia3d302ade71d558f4749177a522e08b768f20735
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | wpa_supplicant/wpa_supplicant.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index beec16e..27fc84a 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -1493,10 +1493,8 @@ int wpa_drv_scan(struct wpa_supplicant *wpa_s, struct wpa_ssid **ssid_ptr) if (wpa_s->driver->combo_scan) { ret = wpa_s->driver->combo_scan(wpa_s->drv_priv, ssid_ptr, wpa_s->conf->ssid); - if (!ret) { - wpa_s->prev_scan_ssid = (*ssid_ptr) ? - (*ssid_ptr) : BROADCAST_SSID_SCAN; - } + wpa_s->prev_scan_ssid = (*ssid_ptr && !ret) ? + (*ssid_ptr) : BROADCAST_SSID_SCAN; } else if (wpa_s->driver->scan) { if (*ssid_ptr) { |