From 45fee6f0908ea8229171d43cdf782d93eee63969 Mon Sep 17 00:00:00 2001
From: Sudhakar Swaminathan <Sudhakar.Swaminathan@Atheros.com>
Date: Fri, 17 Dec 2010 15:06:48 +0200
Subject: [PATCH] P2P: Cancel group formation timeout on p2p_cancel

---
 wpa_supplicant/p2p_supplicant.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 42c2a397b..d08492f95 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -3974,6 +3974,8 @@ int wpas_p2p_cancel(struct wpa_supplicant *wpa_s)
 				   "formation found - cancelling",
 				   wpa_s->ifname);
 			found = 1;
+			eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
+					     wpa_s->parent, NULL);
 			wpas_p2p_group_delete(wpa_s);
 			break;
 		}