aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/wps_supplicant.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2014-01-06 15:56:50 (GMT)
committerJouni Malinen <j@w1.fi>2014-01-07 08:45:12 (GMT)
commit95fb2db2420d8fa291fd6423cc6dbcd042f4eb46 (patch)
tree35bdbc385fc5bde1f92a1dd7214d3089b386a9e1 /wpa_supplicant/wps_supplicant.c
parent6fc61e180ed0706fb7784e768649541974c7b7f5 (diff)
downloadhostap-95fb2db2420d8fa291fd6423cc6dbcd042f4eb46.zip
hostap-95fb2db2420d8fa291fd6423cc6dbcd042f4eb46.tar.gz
hostap-95fb2db2420d8fa291fd6423cc6dbcd042f4eb46.tar.bz2
P2P: Reject group formation on WPS provisioning failure
There is no need to wait for the 15 second group formation timeout to clear the state if WPS failure is detected during P2P group formation. Allow the WPS exchange steps (WSC_NACK and EAP-Failure) to be completed and remove the group to get rid of the extra wait. Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant/wps_supplicant.c')
-rw-r--r--wpa_supplicant/wps_supplicant.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index 6c7508c..038c7fa 100644
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -1,6 +1,6 @@
/*
* wpa_supplicant / WPS integration
- * Copyright (c) 2008-2013, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2008-2014, Jouni Malinen <j@w1.fi>
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
@@ -54,6 +54,11 @@ static void wpas_wps_clear_ap_info(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 &&
eap_is_wps_pin_enrollee(&wpa_s->current_ssid->eap)) {