DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

P2P: Stop p2p_find/p2p_listen when Invitation is accepted

Browse source 
When an Invitation to reinvoke a persistent group is accepted,
we need to make sure that any pending p2p_find or p2p_listen
operation gets stopped to avoid consuming all radio resources
doing device discovery while the group is being set up.
This commit is contained in:
Jouni Malinen 2010-11-19 12:58:03 +02:00 committed by Jouni Malinen
parent 6c0da49f62
commit 9d39057c2b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
wpa_supplicant/p2p_supplicant.c
View file

@ -3174,8 +3174,8 @@ int wpas_p2p_group_add_persistent(struct wpa_supplicant *wpa_s,
return 0; return 0;
} }
wpa_s->p2p_long_listen = 0; /* Make sure we are not running find during connection establishment */
eloop_cancel_timeout(wpas_p2p_long_listen_timeout, wpa_s, NULL); wpas_p2p_stop_find(wpa_s);
if (ssid->mode == WPAS_MODE_INFRA) if (ssid->mode == WPAS_MODE_INFRA)
return wpas_start_p2p_client(wpa_s, ssid, addr_allocated); return wpas_start_p2p_client(wpa_s, ssid, addr_allocated);
@ -3346,6 +3346,7 @@ void wpas_p2p_stop_find(struct wpa_supplicant *wpa_s)
{ {
wpas_p2p_clear_pending_action_tx(wpa_s); wpas_p2p_clear_pending_action_tx(wpa_s);
wpa_s->p2p_long_listen = 0; wpa_s->p2p_long_listen = 0;
eloop_cancel_timeout(wpas_p2p_long_listen_timeout, wpa_s, NULL);
eloop_cancel_timeout(wpas_p2p_join_scan, wpa_s, NULL); eloop_cancel_timeout(wpas_p2p_join_scan, wpa_s, NULL);
p2p_stop_find(wpa_s->global->p2p); p2p_stop_find(wpa_s->global->p2p);