aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2016-01-06 16:49:15 (GMT)
committerJouni Malinen <j@w1.fi>2016-01-06 16:49:15 (GMT)
commit1d20c66e45c8b17cbdbb161c663fb3d2914ce80e (patch)
treeef688bc2dcb3ada6690d244e7b265a9a8af536b6
parent27446e471c5e08913e8230b90ffc6c2a5659d10a (diff)
downloadhostap-1d20c66e45c8b17cbdbb161c663fb3d2914ce80e.zip
hostap-1d20c66e45c8b17cbdbb161c663fb3d2914ce80e.tar.gz
hostap-1d20c66e45c8b17cbdbb161c663fb3d2914ce80e.tar.bz2
P2P: Clear groups first on FLUSH command
This is needed to get proper P2P group removal processing for some test cases. discovery_group_client followed by nfc_p2p_client was able to hit a case where the P2P group idle timeout survived to the next group instance because of the FLUSH command not clearing the group and this timeout properly. Signed-off-by: Jouni Malinen <j@w1.fi>
-rw-r--r--wpa_supplicant/ctrl_iface.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 848f323..b3d6246 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -6982,9 +6982,9 @@ static void wpa_supplicant_ctrl_iface_flush(struct wpa_supplicant *wpa_s)
}
#ifdef CONFIG_P2P
+ wpas_p2p_group_remove(p2p_wpa_s, "*");
wpas_p2p_cancel(p2p_wpa_s);
p2p_ctrl_flush(p2p_wpa_s);
- wpas_p2p_group_remove(p2p_wpa_s, "*");
wpas_p2p_service_flush(p2p_wpa_s);
p2p_wpa_s->global->p2p_disabled = 0;
p2p_wpa_s->global->p2p_per_sta_psk = 0;