X-Git-Url: http://www.project-moonshot.org/gitweb/?p=libeap.git;a=blobdiff_plain;f=wpa_supplicant%2Fevents.c;h=e9dea1510a35fae9ccb37431e16f8452004c9b40;hp=e16b45f49924554f89870558a23cdfdf3132c87b;hb=199716adb3ab4688cb0b97eb38c57de776ce6bc2;hpb=9919f7a22bb07f92ff43a36c38152c8d28546f8f diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index e16b45f..e9dea15 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -632,7 +632,10 @@ void wpa_supplicant_connect(struct wpa_supplicant *wpa_s, if (wpas_p2p_notif_pbc_overlap(wpa_s) == 1) return; #endif /* CONFIG_P2P */ + +#ifdef CONFIG_WPS wpas_wps_cancel(wpa_s); +#endif /* CONFIG_WPS */ return; } @@ -1805,6 +1808,7 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, case EVENT_INTERFACE_ENABLED: wpa_printf(MSG_DEBUG, "Interface was enabled"); if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED) { +#ifdef CONFIG_AP if (!wpa_s->ap_iface) { wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED); @@ -1812,6 +1816,10 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, } else wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); +#else /* CONFIG_AP */ + wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED); + wpa_supplicant_req_scan(wpa_s, 0, 0); +#endif /* CONFIG_AP */ } break; case EVENT_INTERFACE_DISABLED: