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

P2P: Do not consider the p2p_scan results after p2p_stop_find

Browse source 
If p2p_stop_find is issued after the p2p_scan request is triggered to
the host driver, the obtained scan results are also considered to update
the P2P peer entries. This is not always desired behavior, i.e., it can
be clearer if no P2P-DEVICE-FOUND events are generated based of that
final pending scan.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Sunil Dutt 2014-10-30 20:51:52 +05:30 committed by Jouni Malinen
parent b5ea99377f
commit 477b082cc4
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wpa_supplicant/ctrl_iface.c
View file

@ -5035,6 +5035,7 @@ static void p2p_ctrl_flush(struct wpa_supplicant *wpa_s)
{ {
os_memset(wpa_s->p2p_auth_invite, 0, ETH_ALEN); os_memset(wpa_s->p2p_auth_invite, 0, ETH_ALEN);
wpa_s->force_long_sd = 0; wpa_s->force_long_sd = 0;
wpas_p2p_stop_find(wpa_s);
if (wpa_s->global->p2p) if (wpa_s->global->p2p)
p2p_flush(wpa_s->global->p2p); p2p_flush(wpa_s->global->p2p);
} }

28
wpa_supplicant/p2p_supplicant.c
View file

@ -5900,6 +5900,28 @@ int wpas_p2p_find(struct wpa_supplicant *wpa_s, unsigned int timeout,
} }
static void wpas_p2p_scan_res_ignore_search(struct wpa_supplicant *wpa_s,
struct wpa_scan_results *scan_res)
{
wpa_printf(MSG_DEBUG, "P2P: Ignore scan results");
if (wpa_s->p2p_scan_work) {
struct wpa_radio_work *work = wpa_s->p2p_scan_work;
wpa_s->p2p_scan_work = NULL;
radio_work_done(work);
}
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return;
/*
* Indicate that results have been processed so that the P2P module can
* continue pending tasks.
*/
p2p_scan_res_handled(wpa_s->global->p2p);
}
static void wpas_p2p_stop_find_oper(struct wpa_supplicant *wpa_s) static void wpas_p2p_stop_find_oper(struct wpa_supplicant *wpa_s)
{ {
wpas_p2p_clear_pending_action_tx(wpa_s); wpas_p2p_clear_pending_action_tx(wpa_s);
@ -5909,6 +5931,12 @@ static void wpas_p2p_stop_find_oper(struct wpa_supplicant *wpa_s)
if (wpa_s->global->p2p) if (wpa_s->global->p2p)
p2p_stop_find(wpa_s->global->p2p); p2p_stop_find(wpa_s->global->p2p);
if (wpa_s->scan_res_handler == wpas_p2p_scan_res_handler) {
wpa_printf(MSG_DEBUG,
"P2P: Do not consider the scan results after stop_find");
wpa_s->scan_res_handler = wpas_p2p_scan_res_ignore_search;
}
} }