jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

P2P: Clear pending Action TX frame on p2p_stop_find and p2p_listen

Browse source 
This is needed to avoid issues with the previous TX command from
stopping long Listen state.
This commit is contained in:
Jouni Malinen 2010-08-02 20:40:54 -07:00 committed by Jouni Malinen
parent 6125c661d5
commit 1cc3a29d49
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
wpa_supplicant/p2p_supplicant.c
View file

@ -2641,6 +2641,9 @@ static int wpas_p2p_listen_start(struct wpa_supplicant *wpa_s,
void wpas_p2p_cancel_remain_on_channel_cb(struct wpa_supplicant *wpa_s, void wpas_p2p_cancel_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
unsigned int freq) unsigned int freq)
{ {
wpa_printf(MSG_DEBUG, "P2P: Cancel remain-on-channel callback "
"(p2p_long_listen=%d pending_action_tx=%p)",
wpa_s->p2p_long_listen, wpa_s->pending_action_tx);
wpa_s->off_channel_freq = 0; wpa_s->off_channel_freq = 0;
if (p2p_listen_end(wpa_s->global->p2p, freq) > 0) if (p2p_listen_end(wpa_s->global->p2p, freq) > 0)
return; /* P2P module started a new operation */ return; /* P2P module started a new operation */
@ -2963,9 +2966,22 @@ int wpas_p2p_scan_result_text(const u8 *ies, size_t ies_len, char *buf,
} }
static void wpas_p2p_clear_pending_action_tx(struct wpa_supplicant *wpa_s)
{
if (!wpa_s->pending_action_tx)
return;
wpa_printf(MSG_DEBUG, "P2P: Drop pending Action TX due to new "
"operation request");
wpabuf_free(wpa_s->pending_action_tx);
wpa_s->pending_action_tx = NULL;
}
int wpas_p2p_find(struct wpa_supplicant *wpa_s, unsigned int timeout, int wpas_p2p_find(struct wpa_supplicant *wpa_s, unsigned int timeout,
enum p2p_discovery_type type) enum p2p_discovery_type type)
{ {
wpas_p2p_clear_pending_action_tx(wpa_s);
wpa_s->p2p_long_listen = 0; wpa_s->p2p_long_listen = 0;
return p2p_find(wpa_s->global->p2p, timeout, type); return p2p_find(wpa_s->global->p2p, timeout, type);
@ -2974,6 +2990,7 @@ int wpas_p2p_find(struct wpa_supplicant *wpa_s, unsigned int timeout,
void wpas_p2p_stop_find(struct wpa_supplicant *wpa_s) void wpas_p2p_stop_find(struct wpa_supplicant *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_join_scan, wpa_s, NULL); eloop_cancel_timeout(wpas_p2p_join_scan, wpa_s, NULL);
@ -2994,6 +3011,8 @@ int wpas_p2p_listen(struct wpa_supplicant *wpa_s, unsigned int timeout)
{ {
int res; int res;
wpas_p2p_clear_pending_action_tx(wpa_s);
if (timeout == 0) { if (timeout == 0) {
/* /*
* This is a request for unlimited Listen state. However, at * This is a request for unlimited Listen state. However, at