From: Sudhakar Swaminathan <Sudhakar.Swaminathan@Atheros.com>
Date: Fri, 17 Dec 2010 13:04:14 +0000 (+0200)
Subject: P2P: Cancel group formation on PBC overlap
X-Git-Tag: hostap-1-bp~685
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a14e3ec8b8fc2755b12e3e13ce0db3b802a91c9;p=thirdparty%2Fhostap.git

P2P: Cancel group formation on PBC overlap

We should cancel group formation completely on PBC overlap instead
of just partially notifying that operations were stopped. There is
no point in waiting for the group formation timeout in this case.
---

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 248d9f14c..94f8cec1a 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -3914,6 +3914,13 @@ int wpas_p2p_notif_pbc_overlap(struct wpa_supplicant *wpa_s)
 		   "session overlap");
 	if (wpa_s != wpa_s->parent)
 		wpa_msg_ctrl(wpa_s->parent, MSG_INFO, WPS_EVENT_OVERLAP);
+
+	if (wpa_s->global->p2p)
+		p2p_group_formation_failed(wpa_s->global->p2p);
+
+	eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
+			     wpa_s->parent, NULL);
+
 	wpas_group_formation_completed(wpa_s, 0);
 	return 1;
 }