Merge commit 'garage/master'

[wpasupplicant] / wpa_supplicant / events.c

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 5186d2a..159b024 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -615,6 +615,8 @@ static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s)
        struct wpa_scan_res *selected = NULL;
        struct wpa_ssid *ssid = NULL;
 
+       wpa_supplicant_notify_scanning(wpa_s, 0);
+
        if (wpa_supplicant_get_scan_results(wpa_s) < 0) {
                if (wpa_s->conf->ap_scan == 2)
                        return;
@@ -1226,6 +1228,15 @@ void wpa_supplicant_event(void *ctx, wpa_event_type event,
                wpa_supplicant_event_ibss_rsn_start(wpa_s, data);
                break;
 #endif /* CONFIG_IBSS_RSN */
+       case EVENT_ASSOC_REJECT:
+               sme_event_assoc_reject(wpa_s, data);
+               break;
+       case EVENT_AUTH_TIMED_OUT:
+               sme_event_auth_timed_out(wpa_s, data);
+               break;
+       case EVENT_ASSOC_TIMED_OUT:
+               sme_event_assoc_timed_out(wpa_s, data);
+               break;
        default:
                wpa_printf(MSG_INFO, "Unknown event %d", event);
                break;