diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2014-05-20 12:39:21 +0530 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2014-09-09 22:18:14 +0000 |
| commit | 298f5b84159a2334bb31fd1af9a6d887346c130d (patch) | |
| tree | 5aa2c10346d93e8082388f30986e3167d1b4921a | |
| parent | e0a8146744cd0f4a55d0f95d961c8e2bd9dbaf09 (diff) | |
| download | android_external_wpa_supplicant_8-298f5b84159a2334bb31fd1af9a6d887346c130d.tar.gz android_external_wpa_supplicant_8-298f5b84159a2334bb31fd1af9a6d887346c130d.tar.bz2 android_external_wpa_supplicant_8-298f5b84159a2334bb31fd1af9a6d887346c130d.zip | |
P2P: Refrain from performing extended listen during PD
Extend the previous commit 0f1034e3889e7b8f54ed59317f1234db8167d12e to
skip extended listen also based on ongoing provision discovery operation
(which does not show up as a separate P2P module state and as such, was
not coveraged by the previous commit).
CRs-Fixed: 661586
Git-commit: 7e68be38e46d8f6cc7d5bc8083fe470d0418fb4f
Git-repo : git://w1.fi/srv/git/hostap.git
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Change-Id: Icdf4aac5b4b7c5600459f07a680f1171f8191dd0
| -rw-r--r-- | src/p2p/p2p.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index b0da1d13..1126f2d1 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -3875,8 +3875,10 @@ static void p2p_ext_listen_timeout(void *eloop_ctx, void *timeout_ctx) p2p_ext_listen_timeout, p2p, NULL); } - if (p2p->cfg->is_p2p_in_progress && - p2p->cfg->is_p2p_in_progress(p2p->cfg->cb_ctx)) { + if ((p2p->cfg->is_p2p_in_progress && + p2p->cfg->is_p2p_in_progress(p2p->cfg->cb_ctx)) || + (p2p->pending_action_state == P2P_PENDING_PD && + p2p->pd_retries > 0)) { p2p_dbg(p2p, "Operation in progress - skip Extended Listen timeout (%s)", p2p_state_txt(p2p->state)); return; |