diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-03-18 13:09:42 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-03-18 13:09:42 -0700 |
| commit | 37d4d6a4efea4ef4f864347ac8ed8d62a9e19f90 (patch) | |
| tree | 1ba89b70d23d1416587cb3fcd1f414c2ed6dd766 /src/p2p | |
| parent | 700a137ab366edc72e371da68ba187b4717ee660 (diff) | |
| download | android_external_wpa_supplicant_8-37d4d6a4efea4ef4f864347ac8ed8d62a9e19f90.tar.gz android_external_wpa_supplicant_8-37d4d6a4efea4ef4f864347ac8ed8d62a9e19f90.tar.bz2 android_external_wpa_supplicant_8-37d4d6a4efea4ef4f864347ac8ed8d62a9e19f90.zip | |
Accumulative patch from commit 52728dcd25b5074fb7c0493a8155f096089ad6d0
P2P: Stop P2P_PD_DURING_FIND wait on PD Response RX
P2P: Postpone P2P scan only if station mode scan is pending
Use special scan result processing steps only on requesting interface
P2P: Re-start P2P operation if station mode scanning is stopped
P2P: Use common function for re-starting P2P scan after station scan
Change-Id: I62bb738a912483647606de1a5bd5357346ebd8f9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/p2p')
| -rw-r--r-- | src/p2p/p2p_pd.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c index 44db6822..d8f33b1b 100644 --- a/src/p2p/p2p_pd.c +++ b/src/p2p/p2p_pd.c @@ -346,6 +346,11 @@ out: if (success && p2p->cfg->prov_disc_resp) p2p->cfg->prov_disc_resp(p2p->cfg->cb_ctx, sa, report_config_methods); + + if (p2p->state == P2P_PD_DURING_FIND) { + p2p_clear_timeout(p2p); + p2p_continue_find(p2p); + } } |