• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonwindowsphpgamebathyscaphegui翻訳comegattwitterframeworkbtronvb.net計画中(planning stage)testdomarduinodirectxpreviewerゲームエンジン

external/wpa_supplicant_6


Commit MetaInfo

Revisiona3a0d9c0aface678403648c4e723537475e40e41 (tree)
Zeit2010-11-09 07:03:19
AutorDmitry Shmidt <dimitrysh@goog...>
CommiterDmitry Shmidt

Log Message

Fix combo-scan prev SSID pointer update in case of scan failure

Change-Id: Ia3d302ade71d558f4749177a522e08b768f20735
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

Ändern Zusammenfassung

Diff

--- 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)
14931493 if (wpa_s->driver->combo_scan) {
14941494 ret = wpa_s->driver->combo_scan(wpa_s->drv_priv, ssid_ptr,
14951495 wpa_s->conf->ssid);
1496- if (!ret) {
1497- wpa_s->prev_scan_ssid = (*ssid_ptr) ?
1498- (*ssid_ptr) : BROADCAST_SSID_SCAN;
1499- }
1496+ wpa_s->prev_scan_ssid = (*ssid_ptr && !ret) ?
1497+ (*ssid_ptr) : BROADCAST_SSID_SCAN;
15001498 }
15011499 else if (wpa_s->driver->scan) {
15021500 if (*ssid_ptr) {