projects
/
libeap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9919f7a
)
Fix wpa_supplicant build without CONFIG_WPS and CONFIG_AP
author
Ben Greear
<greearb@candelatech.com>
Thu, 7 Oct 2010 07:41:58 +0000
(10:41 +0300)
committer
Jouni Malinen
<j@w1.fi>
Thu, 7 Oct 2010 07:41:58 +0000
(10:41 +0300)
wpa_supplicant/events.c
patch
|
blob
|
history
diff --git
a/wpa_supplicant/events.c
b/wpa_supplicant/events.c
index
e16b45f
..
e9dea15
100644
(file)
--- 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 */
if (wpas_p2p_notif_pbc_overlap(wpa_s) == 1)
return;
#endif /* CONFIG_P2P */
+
+#ifdef CONFIG_WPS
wpas_wps_cancel(wpa_s);
wpas_wps_cancel(wpa_s);
+#endif /* CONFIG_WPS */
return;
}
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) {
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);
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
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:
}
break;
case EVENT_INTERFACE_DISABLED: