GitLab

This reverts commit 5d03c02c

Change-Id: I27492d70600007f6a1230b166e03c7a47ad63788

The Qualcomm qcwcn driver relies upon information from the supplicant
to enable 802.11n and 802.11d support.  Unfortunately there currently
does not exist configuration file parameters to control these items,
therefore hard code these in the supplicant.

Change-Id: Iaa586c58d96bd8966b47f6e18b627648df89c03e

Change-Id: I265b095235890be623090272a81e67123ff86185
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

Update the wpa_supplicant and hostapd makefiles to enable
ANDROID_P2P and ANDROID_QCOM_WCN conditional compilation
when the BOARD_WLAN_DEVICE is qcwcn.

Change-Id: I5d8216bdede6d6eb6613a83cda2c67c5eb7c2280

Change-Id: Ic3f1375953f4a7c77d2208f8436d951889093397
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

* commit '978afbdb':
  Get rid of LOCAL_MODULE_TAGS := user

* commit '6f0634d6':
  Get rid of LOCAL_MODULE_TAGS := user

With the availability of MASK option, the number of lines per BSS is not obvious,
add a delimiter to make parsing less flaky

Bug: 2961159
Change-Id: I9e5523f8da183e0735dbc06f0c09c9f841060504

Change-Id: I1753151ac1a7b6f7cf48112185342faea44e8327
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

Change-Id: I4aed30c59c549c2ce7488f12df4e68c6154f0ffe
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

- Remove interface priority
- Add action parameter to service discovery functionality

Change-Id: Ibc74c4053996e91f2f577b57695c68c86b5603c2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

Have the customized retry behavior only for P2P & do group failure indication
beyond 5 retries

Bug: b/6674338, b/6910598
Change-Id: I58cba356ebdb7fc4eaa9bedfa417b7d5d35bb306

Conflicts:

	wpa_supplicant/events.c

- for the new WiFi watchdog
- requires kernel support (see issue 6874044)

Change-Id: Ibb59c1e0df6f5422814f2260588651e0e1490ccc

pending_bssid is not valid during roaming, use bssid

Bug: 6915644
Change-Id: Ib2181a41845f90812bd7428dbef6433adfe9f749

Change-Id: I6d9ed4e6e1d94cfedcb703eec4adfe227d35b473

dev.config_methods was not updated when wps_update_config was called.
Led to mismatch config methods between probe_request and M1 packets.
Add missing part for it.

Change-Id: I02bd016a35726c7cf05cd71840082edd677b04b8

am 9b7656e8: am 9a57740c: Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability"

* commit '9b7656e8':
  Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability

am 9a57740c: Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability"

* commit '9a57740c':
  Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability

Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability"

Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability

Bug: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/969343/comments/72
Bug: http://w1.fi/bugz/show_bug.cgi?id=447#c7
Bug: http://code.google.com/p/android/issues/detail?id=34212
Bug: 6883259

(cherry-picked from 27bf1073)

Change-Id: I9364e94853a404130125ab8df791193a886fdd34

am 27bf1073: Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability

* commit '27bf1073':
  Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability

Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability

Bug: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/969343/comments/72
Bug: http://w1.fi/bugz/show_bug.cgi?id=447#c7
Bug: http://code.google.com/p/android/issues/detail?id=34212
Bug: 6883259
Change-Id: Ib53326cc8cd40e800454b7b92586c052bc910ba8

commit a5ed45586c63ffd8f9d2b44e27c251d7bacbeaf4
Author: Jouni Malinen <j@w1.fi>
Date:   Sat Jul 7 13:01:45 2012 +0300

    WPS SSDP: Fix socket leaks on error paths

Change-Id: I0864aac7fc88fa2a60f5cca7d524b94363410c85
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

BUG: b/6826116

Change-Id: I35023ce94152a402da94c34083de8ea1387cc758
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

Change-Id: Ic5d5769b80804d3e8b577e988a1caf1e149b8c01
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

Have the customized retry behavior only for P2P & do group failure indication
beyond 5 retries

Bug: 6674338
Change-Id: I58cba356ebdb7fc4eaa9bedfa417b7d5d35bb306

- Fix listen timing to improve SD reliability
- Fix SD packet scheduling

Bug: 6629112
Change-Id: I01365279439116256372d019bdbfd4b2113bf2ce

Change-Id: I4ee99454838185487065d3acbccf721aecf7f760
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

Bug: 6613470
Change-Id: Ia96694ce906414b3f56cd57416d7c4c6f2030a6e

BUG: 6584268

Change-Id: Ib840d6b678a914be4e50d4916fecc1738b2b56f9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

- 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>

Bug [Issue 6517978]

Change-Id: Ife823dce3b8b50c0c3eb0d5a2d8ecf2c8e4ac17e