From 35d403096eb63c787bd736dd8ba0902c34398fa8 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 17 Aug 2015 00:16:46 +0300 Subject: [PATCH] Set NORMAL_SCAN_REQ on SELECT_NETWORK/ENABLE_NETWORK 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 --- wpa_supplicant/wpa_supplicant.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 9a5d180be..9951b0f4f 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -2581,8 +2581,10 @@ void wpa_supplicant_enable_network(struct wpa_supplicant *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); + } } } @@ -2710,8 +2712,10 @@ void wpa_supplicant_select_network(struct wpa_supplicant *wpa_s, wpa_s->reassociate = 1; 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); + } if (ssid) wpas_notify_network_selected(wpa_s, ssid);