diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2014-02-21 11:22:49 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2014-02-21 11:22:49 -0800 |
| commit | 7f93d6fa14a343127754c33a03cf2f641b6ff6e4 (patch) | |
| tree | edf8a93f73c45c8bfa9beae9d470224f3bcf72e9 /src/p2p | |
| parent | 745be3f298f4a0899238a99d96b7ed804edd3329 (diff) | |
| download | android_external_wpa_supplicant_8-7f93d6fa14a343127754c33a03cf2f641b6ff6e4.tar.gz android_external_wpa_supplicant_8-7f93d6fa14a343127754c33a03cf2f641b6ff6e4.tar.bz2 android_external_wpa_supplicant_8-7f93d6fa14a343127754c33a03cf2f641b6ff6e4.zip | |
Cumulative patch from commit aef5047acc971c97622c85236f0cd84d169221e6
aef5047 P2P: Fix missing eloop_cancel_timeout in invitation trigger
3cdcb34 tests: Add module tests for WPS attribute parsing
da179bd WPS: Fix parsing of 0-length WFA vendor extension subelement
211d7ab P2P: Add even more debug prints for Probe Request in non-Listen state
Change-Id: Ifbdb1c8aa74906aaf60cb5be025dd7f02bb07c6e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/p2p')
| -rw-r--r-- | src/p2p/p2p.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index 7170e47e..6f3cd687 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -1971,7 +1971,8 @@ p2p_reply_probe(struct p2p_data *p2p, const u8 *addr, const u8 *dst, if (!p2p->in_listen || !p2p->drv_in_listen) { /* not in Listen state - ignore Probe Request */ - p2p_dbg(p2p, "Not in Listen state - ignore Probe Request"); + p2p_dbg(p2p, "Not in Listen state (in_listen=%d drv_in_listen=%d) - ignore Probe Request", + p2p->in_listen, p2p->drv_in_listen); return P2P_PREQ_NOT_LISTEN; } @@ -2142,6 +2143,7 @@ p2p_probe_req_rx(struct p2p_data *p2p, const u8 *addr, const u8 *dst, == 0) { /* Received a Probe Request from Invite peer */ p2p_dbg(p2p, "Found Invite peer - try to start Invite from timeout"); + eloop_cancel_timeout(p2p_invite_start, p2p, NULL); eloop_register_timeout(0, 0, p2p_invite_start, p2p, NULL); return P2P_PREQ_PROCESSED; } |