jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Set NORMAL_SCAN_REQ on SELECT_NETWORK/ENABLE_NETWORK

Browse source 
wpa_s->scan_req needs to be set in these cases to get correct scanning
behavior. This is mainly needed for starting of AP mode operation
immediately in ap_scan=2 case.

This fixes an issue that was found with mac80211_hwsim test cases in the
following sequence: dbus_autoscan dbus_ap_scan_2_ap_mode_scan

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-08-17 00:16:46 +03:00
parent 035efb2c43
commit 35d403096e
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wpa_supplicant/wpa_supplicant.c
View file

@ -2581,10 +2581,12 @@ void wpa_supplicant_enable_network(struct wpa_supplicant *wpa_s,
wpa_supplicant_cancel_sched_scan(wpa_s); wpa_supplicant_cancel_sched_scan(wpa_s);
} }
if (wpa_supplicant_fast_associate(wpa_s) != 1) if (wpa_supplicant_fast_associate(wpa_s) != 1) {
wpa_s->scan_req = NORMAL_SCAN_REQ;
wpa_supplicant_req_scan(wpa_s, 0, 0); wpa_supplicant_req_scan(wpa_s, 0, 0);
} }
} }
}
/** /**
@ -2710,8 +2712,10 @@ void wpa_supplicant_select_network(struct wpa_supplicant *wpa_s,
wpa_s->reassociate = 1; wpa_s->reassociate = 1;
if (wpa_s->connect_without_scan || if (wpa_s->connect_without_scan ||
wpa_supplicant_fast_associate(wpa_s) != 1) wpa_supplicant_fast_associate(wpa_s) != 1) {
wpa_s->scan_req = NORMAL_SCAN_REQ;
wpa_supplicant_req_scan(wpa_s, 0, disconnected ? 100000 : 0); wpa_supplicant_req_scan(wpa_s, 0, disconnected ? 100000 : 0);
}
if (ssid) if (ssid)
wpas_notify_network_selected(wpa_s, ssid); wpas_notify_network_selected(wpa_s, ssid);