aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/wps_supplicant.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2014-06-15 16:31:53 (GMT)
committerJouni Malinen <j@w1.fi>2014-06-15 16:31:53 (GMT)
commitbd10d93891c3f8191b2e5c7d82ca227875cfe89d (patch)
tree7f4fd2822078fd17311e2fa573ceff01942e3e7f /wpa_supplicant/wps_supplicant.c
parent2eae05f7808875e367e79c66069d090f159f4ea2 (diff)
downloadhostap-bd10d93891c3f8191b2e5c7d82ca227875cfe89d.zip
hostap-bd10d93891c3f8191b2e5c7d82ca227875cfe89d.tar.gz
hostap-bd10d93891c3f8191b2e5c7d82ca227875cfe89d.tar.bz2
P2P: Clean up by moving ifdef CONFIG_P2P to p2p_suppplicant.h
This removes number of unnecessary #ifdef CONFIG_P2P blocks from generic code by hiding the conditional build into p2p_supplicant.h with empty inline functions. Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant/wps_supplicant.c')
-rw-r--r--wpa_supplicant/wps_supplicant.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index de015ee..fd0d14a 100644
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -73,10 +73,8 @@ static void wpas_wps_assoc_with_cred_cancel(struct wpa_supplicant *wpa_s)
int wpas_wps_eapol_cb(struct wpa_supplicant *wpa_s)
{
-#ifdef CONFIG_P2P
if (wpas_p2p_wps_eapol_cb(wpa_s) > 0)
return 1;
-#endif /* CONFIG_P2P */
if (!wpa_s->wps_success &&
wpa_s->current_ssid &&
@@ -576,9 +574,7 @@ static void wpa_supplicant_wps_event_fail(struct wpa_supplicant *wpa_s,
eloop_register_timeout(0, 100000, wpas_wps_clear_timeout, wpa_s, NULL);
wpas_notify_wps_event_fail(wpa_s, fail);
-#ifdef CONFIG_P2P
wpas_p2p_wps_failed(wpa_s, fail);
-#endif /* CONFIG_P2P */
}
@@ -637,9 +633,7 @@ static void wpa_supplicant_wps_event_success(struct wpa_supplicant *wpa_s)
eloop_register_timeout(10, 0, wpas_wps_reenable_networks_cb, wpa_s,
NULL);
-#ifdef CONFIG_P2P
wpas_p2p_wps_success(wpa_s, wpa_s->bssid, 0);
-#endif /* CONFIG_P2P */
}