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

P2P: Do not stop Listen state if it is on correct channel

Browse source 
This is needed to optimize response to GO Negotiation Request frames.
The extra remain-on-channel cancel followed by new remain-on-channel for
the same channel takes too much time with some driver/firmware
designs for the response to go out quickly enough to avoid peer
timing out while waiting for our response.
This commit is contained in:
Jouni Malinen 2010-10-20 19:37:47 +03:00 committed by Jouni Malinen
parent 35c5d61037
commit 0b8889d8e5
3 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/p2p/p2p.c
View file

@ -783,7 +783,7 @@ int p2p_find(struct p2p_data *p2p, unsigned int timeout,
} }
void p2p_stop_find(struct p2p_data *p2p) void p2p_stop_find_for_freq(struct p2p_data *p2p, int freq)
{ {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Stopping find"); wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Stopping find");
eloop_cancel_timeout(p2p_find_timeout, p2p, NULL); eloop_cancel_timeout(p2p_find_timeout, p2p, NULL);
@ -793,10 +793,21 @@ void p2p_stop_find(struct p2p_data *p2p)
p2p->go_neg_peer = NULL; p2p->go_neg_peer = NULL;
p2p->sd_peer = NULL; p2p->sd_peer = NULL;
p2p->invite_peer = NULL; p2p->invite_peer = NULL;
if (freq > 0 && p2p->drv_in_listen == freq && p2p->in_listen) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Skip stop_listen "
"since we are on correct channel for response");
return;
}
p2p->cfg->stop_listen(p2p->cfg->cb_ctx); p2p->cfg->stop_listen(p2p->cfg->cb_ctx);
} }
void p2p_stop_find(struct p2p_data *p2p)
{
p2p_stop_find_for_freq(p2p, 0);
}
static int p2p_prepare_channel(struct p2p_data *p2p, unsigned int force_freq) static int p2p_prepare_channel(struct p2p_data *p2p, unsigned int force_freq)
{ {
if (force_freq) { if (force_freq) {
@ -2193,7 +2204,7 @@ void p2p_listen_cb(struct p2p_data *p2p, unsigned int freq,
p2p->pending_listen_sec, p2p->pending_listen_usec, p2p->pending_listen_sec, p2p->pending_listen_usec,
p2p->pending_listen_freq); p2p->pending_listen_freq);
p2p->in_listen = 1; p2p->in_listen = 1;
p2p->drv_in_listen = 1; p2p->drv_in_listen = freq;
if (p2p->pending_listen_sec || p2p->pending_listen_usec) { if (p2p->pending_listen_sec || p2p->pending_listen_usec) {
/* /*
* Add 20 msec extra wait to avoid race condition with driver * Add 20 msec extra wait to avoid race condition with driver

10
src/p2p/p2p.h
View file

@ -669,6 +669,16 @@ int p2p_find(struct p2p_data *p2p, unsigned int timeout,
*/ */
void p2p_stop_find(struct p2p_data *p2p); void p2p_stop_find(struct p2p_data *p2p);
/**
* p2p_stop_find_for_freq - Stop P2P Find for next oper on specific freq
* @p2p: P2P module context from p2p_init()
* @freq: Frequency in MHz for next operation
*
* This is like p2p_stop_find(), but Listen state is not stopped if we are
* already on the same frequency.
*/
void p2p_stop_find_for_freq(struct p2p_data *p2p, int freq);
/** /**
* p2p_listen - Start P2P Listen state for specified duration * p2p_listen - Start P2P Listen state for specified duration
* @p2p: P2P module context from p2p_init() * @p2p: P2P module context from p2p_init()

2
src/p2p/p2p_go_neg.c
View file

@ -579,7 +579,7 @@ void p2p_process_go_neg_req(struct p2p_data *p2p, const u8 *sa,
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: GO Negotiation with " MACSTR, MAC2STR(sa)); "P2P: GO Negotiation with " MACSTR, MAC2STR(sa));
if (p2p->state != P2P_IDLE) if (p2p->state != P2P_IDLE)
p2p_stop_find(p2p); p2p_stop_find_for_freq(p2p, rx_freq);
p2p_set_state(p2p, P2P_GO_NEG); p2p_set_state(p2p, P2P_GO_NEG);
p2p_clear_timeout(p2p); p2p_clear_timeout(p2p);
dev->dialog_token = msg.dialog_token; dev->dialog_token = msg.dialog_token;