diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-05-30 11:18:46 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-05-30 11:22:51 -0700 |
| commit | 98f9e76624da6bb96edc1982c423e4a119c5170a (patch) | |
| tree | 7d3861403839d7e6e01820e9dcf846d970896780 /src/wps | |
| parent | 5b5fb02b225c5c05a4477bef58bdaceede5d68dc (diff) | |
| download | android_external_wpa_supplicant_8-98f9e76624da6bb96edc1982c423e4a119c5170a.tar.gz android_external_wpa_supplicant_8-98f9e76624da6bb96edc1982c423e4a119c5170a.tar.bz2 android_external_wpa_supplicant_8-98f9e76624da6bb96edc1982c423e4a119c5170a.zip | |
wpa_supplicant: Update to Version 0.8.27 from BRCM
- Fix crash during TRUE pbc overlap
- Fix p2p_stop_find event
- Avoid race condition in GO-NEG process if both peers enter
p2p_connect at the same time
- Retry assoc immediately on ASSOC-REJECT. Previously assoc was
retried on authentication timeout (which occurs after 10secs).
Now on assoc reject, we cancel the auth timer and then initiate
a assoc scan.
BUG: 6543705, 6427094
Change-Id: I4489fb14b6cead069f0d14fcbb9e2224f790d77b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/wps')
| -rw-r--r-- | src/wps/wps_registrar.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c index 85ec3172..5ed7ea4a 100644 --- a/src/wps/wps_registrar.c +++ b/src/wps/wps_registrar.c @@ -312,8 +312,13 @@ static void wps_registrar_remove_pbc_session(struct wps_registrar *reg, pbc = reg->pbc_sessions; while (pbc) { if (os_memcmp(pbc->uuid_e, uuid_e, WPS_UUID_LEN) == 0 || +#ifdef ANDROID_P2P + (p2p_dev_addr && !is_zero_ether_addr(pbc->addr) && + os_memcmp(pbc->addr, p2p_dev_addr, ETH_ALEN) == +#else (p2p_dev_addr && !is_zero_ether_addr(reg->p2p_dev_addr) && os_memcmp(reg->p2p_dev_addr, p2p_dev_addr, ETH_ALEN) == +#endif 0)) { if (prev) prev->next = pbc->next; |