aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2013-11-01 10:31:55 +0200
committerSteve Kondik <shade@chemlab.org>2014-06-12 14:07:29 -0700
commit7ad8428839199986294cc30a645f6d33d2fd15da (patch)
treec790dac87cb10af35931866d1c763819babe71c8
parentdb29c4a8b96ade2fabdbe96f3efb82b099c40490 (diff)
downloadandroid_external_wpa_supplicant_8-7ad8428839199986294cc30a645f6d33d2fd15da.tar.gz
android_external_wpa_supplicant_8-7ad8428839199986294cc30a645f6d33d2fd15da.tar.bz2
android_external_wpa_supplicant_8-7ad8428839199986294cc30a645f6d33d2fd15da.zip
P2P: Clear pending group formation data on group removal
It was possible for the wpa_s->show_group_started and wpa_s->go_params to be left set when a P2P group was removed before group formation had completed. In case a separate P2P group interface was not used, this could rsult in all future scans using the hardcoded DIRECT-* SSID and as such, not find the network they were trying to find. Fix this by clearing these P2P parameters on group removal. CRs-Fixed: 591716 Git-commit: c092d83e268a0e328943b78df1ea05fea9c0de86 Git-repo: git://w1.fi/srv/git/hostap.git Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
-rw-r--r--wpa_supplicant/p2p_supplicant.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 9f5073cf..b61b28aa 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -487,6 +487,10 @@ static int wpas_p2p_group_delete(struct wpa_supplicant *wpa_s,
wpa_s->p2p_in_provisioning = 0;
}
+ wpa_s->show_group_started = 0;
+ os_free(wpa_s->go_params);
+ wpa_s->go_params = NULL;
+
wpa_printf(MSG_DEBUG, "P2P: Remove temporary group network");
if (ssid && (ssid->p2p_group ||
ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION ||