@@ -1308,6 +1308,49 @@ static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s,
#endif /* CONFIG_NO_SCAN_PROCESSING */
+int wpa_supplicant_fast_associate(struct wpa_supplicant *wpa_s,
+ struct wpa_ssid *ssid)
+{
+#ifdef CONFIG_NO_SCAN_PROCESSING
+ return -1;
+#else /* CONFIG_NO_SCAN_PROCESSING */
+ struct wpa_bss *selected_bss;
+ struct wpa_ssid *selected_ssid = NULL;
+ struct os_time now;
+
+ if (wpa_s->last_scan_res_used <= 0) {
+ return -1;
+ }
+
+ os_get_time(&now);
+ if (now.sec - wpa_s->last_scan.sec <= 5) {
+ wpa_printf(MSG_DEBUG, "Fast associate: Old scan results");
+ return -1;
+ }
+
+ selected_bss = wpa_supplicant_pick_network(wpa_s, &selected_ssid);
+
+ if (!selected_bss) {
+ wpa_dbg(wpa_s, MSG_DEBUG, "Fast associate: no suitable bss");
+ return -1;
+ }
+
+ if (selected_ssid != ssid) {
+ wpa_dbg(wpa_s, MSG_DEBUG, "Fast associate: ssid mismatch?!");
+ return -1;
+ }
+
+ if (wpa_supplicant_connect(wpa_s, selected_bss, ssid) < 0) {
+ wpa_dbg(wpa_s, MSG_DEBUG, "Fast associate: Connect failed");
+ return -1;
+ }
+
+ wpa_dbg(wpa_s, MSG_DEBUG, "Fast associate: Successful connect!");
+
+ return 0;
+#endif /* CONFIG_NO_SCAN_PROCESSING */
+}
+
#ifdef CONFIG_WNM
static void wnm_bss_keep_alive(void *eloop_ctx, void *sock_ctx)
@@ -1875,7 +1875,9 @@ void wpa_supplicant_select_network(struct wpa_supplicant *wpa_s,
wpa_s->connect_without_scan = NULL;
wpa_s->disconnected = 0;
wpa_s->reassociate = 1;
- wpa_supplicant_req_scan(wpa_s, 0, disconnected ? 100000 : 0);
+
+ if (!ssid || wpa_supplicant_fast_associate(wpa_s, ssid) != 0)
+ wpa_supplicant_req_scan(wpa_s, 0, disconnected ? 100000 : 0);
if (ssid)
wpas_notify_network_selected(wpa_s, ssid);
@@ -786,6 +786,8 @@ void wpa_supplicant_stop_countermeasures(void *eloop_ctx, void *sock_ctx);
void wpa_supplicant_delayed_mic_error_report(void *eloop_ctx, void *sock_ctx);
void wnm_bss_keep_alive_deinit(struct wpa_supplicant *wpa_s);
int wpas_select_network_from_last_scan(struct wpa_supplicant *wpa_s);
+int wpa_supplicant_fast_associate(struct wpa_supplicant *wpa_s,
+ struct wpa_ssid *ssid);
/* eap_register.c */
int eap_register_methods(void);