aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ifdef the previous changes for compatibility with older drivers.jellybean-releasejellybeanSteve Kondik2012-10-094-3/+28
| | | | Change-Id: Ida38b5691d7cf6b8e26ae942cf9a6c9c7f6216dc
* Merge branch 'jb-mr0-release' of ↵Steve Kondik2012-10-094-22/+43
|\ | | | | | | https://android.googlesource.com/platform/external/wpa_supplicant_8 into aosp-merge
| * Fix 'restore STA reconnection behavior' cherry-pickDmitry Shmidt2012-09-063-5/+10
| | | | | | | | | | | | | | BUG: b/6400311 Change-Id: I7b90ab9b5430b92e9e4e5702c3b1805a6bbc0b9a Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| * Restore STA reconnection behaviorIrfan Sheriff2012-09-061-17/+33
| | | | | | | | | | | | | | | | | | | | | | | | Have the customized retry behavior only for P2P & do group failure indication beyond 5 retries Bug: b/6674338, b/6910598, b/6400311 Change-Id: I58cba356ebdb7fc4eaa9bedfa417b7d5d35bb306 Conflicts: wpa_supplicant/events.c
| * Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better ↵Brian Carlstrom2012-07-251-0/+5
| | | | | | | | | | | | | | | | | | | | 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
* | Use legacy NL80211 STA events for older driversAndrew Dodd2012-08-123-5/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | This allows tethering on devices with older bcmdhd drivers to be fixed. It conditionally reverts b638fe75d3cb9d21c67386173f10afe65053cc4d "nl80211: Use native cfg80211 sta events" for these boards. Use BOARD_LEGACY_NL80211_STA_EVENTS to enable this conditional revert. Change-Id: I4e436c57819944515455725cfd7ac7eeb31552ca
* | Merge "wpa_supplicant_8 - Hostapd: Android related changes for sockets" into ↵Steve Kondik2012-08-052-0/+22
|\ \ | | | | | | | | | jellybean
| * | wpa_supplicant_8 - Hostapd: Android related changes for socketsMDJ2012-07-312-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | Android related changes for socket handling. Similar to ctrl_iface.c in wpa_supplicant/ctrl_iface.c Change-Id: I3f72f5e4746ccdd007f647a923d41629afc17d94 Signed-off-by: Vishal Mahaveer <a0271468@ti.com>
* | | Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better ↵Brian Carlstrom2012-08-021-0/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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 27bf1073abe534644cc1146397082cc78873f516) Change-Id: I9364e94853a404130125ab8df791193a886fdd34
* | Changes done for qcom Wifi bringup on JB.Santosh Sajjan2012-07-294-2/+53
| | | | | | | | | | | | | | Defined ANDROID_P2P and ANDROID_QCOM_P2P_PATCH flag. Added missing driver commands. Change-Id: Ib2f6c304406ad288c7a9d8e4f6e943ff803e605f
* | Revert "Don't use OpenSSL Engines in wpa_supplicant"Steve Kondik2012-07-182-6/+0
| | | | | | | | | | | | This reverts commit 6acfb7c53bd8fe2eeedd6a96188ee1c4b01e8244. Engines are reenabled in Jelly Bean, and this patch breaks EAP.
* | Don't use OpenSSL Engines in wpa_supplicantRobert Burns2012-07-162-0/+6
| | | | | | | | | | | | | | | | | | The Android OpenSSL tree directs us to remove the engines subdir, so we shouldn't try to use engines in wpa_supplicant. Pulled portion from https://android-review.googlesource.com/#/c/11375/2 Change-Id: I4e85d960588eedcbad3de9a94c2641d48d94d2ac
* | wext: Re-add support for SIGNAL_POLL and DRIVERRicardo Cerqueira2012-07-151-0/+2
| | | | | | | | | | | | | | | | Both of these are still used by JB, and wext wifi drivers have some weird behaviors without it (like a reported poor connection 100% of the time) Change-Id: I15339dbea4e15831465e2bb52b11675cb20dc34c
* | Add wpa_driver_nl80211_driver_cmd()Deepthi Gowri2012-07-121-2/+124
|/ | | | Change-Id: I43912fa838e5d52cbd3e5735128df5a8f443eb9c
* Merge "Fix p2p service discovery" into jb-devIrfan Sheriff2012-06-133-4/+100
|\
| * Fix p2p service discoveryIrfan Sheriff2012-06-133-4/+100
| | | | | | | | | | | | | | | | - Fix listen timing to improve SD reliability - Fix SD packet scheduling Bug: 6629112 Change-Id: I01365279439116256372d019bdbfd4b2113bf2ce
* | Merge "wpa_supplicant: Fix compilation without BOARD_WPA_SUPPLICANT_DRIVER" ↵Dmitry Shmidt2012-06-111-6/+2
|\ \ | |/ |/| | | into jb-dev
| * wpa_supplicant: Fix compilation without BOARD_WPA_SUPPLICANT_DRIVERDmitry Shmidt2012-06-111-6/+2
| | | | | | | | | | Change-Id: I4ee99454838185487065d3acbccf721aecf7f760 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | Fix supplicant crash at group removalIrfan Sheriff2012-06-061-0/+6
|/ | | | | Bug: 6613470 Change-Id: Ia96694ce906414b3f56cd57416d7c4c6f2030a6e
* wpa_supplicant: nl80211: Fix message processingDmitry Shmidt2012-05-301-1/+2
| | | | | | | BUG: 6584268 Change-Id: Ib840d6b678a914be4e50d4916fecc1738b2b56f9 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* wpa_supplicant: Update to Version 0.8.27 from BRCMDmitry Shmidt2012-05-308-3/+67
| | | | | | | | | | | | | | | | - 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>
* Fix null pointer access for SSID printing.andy2_kuo2012-05-292-2/+4
| | | | | | Bug [Issue 6517978] Change-Id: Ife823dce3b8b50c0c3eb0d5a2d8ecf2c8e4ac17e
* wpa_supplicant: Make Android makefiles available under the BSD licenseDmitry Shmidt2012-05-144-34/+12
| | | | | Change-Id: I8d9e210748d582c6c5e3a62d47276c676ba74080 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* Fix SSID printing in eventsIrfan Sheriff2012-05-112-2/+4
| | | | | Bug: 6476830 Change-Id: I7909fb9fb56737d0d772921d1de2849ca1296679
* wpa_supplicant: Update to Version 0.8.26 from BRCMDmitry Shmidt2012-05-029-33/+177
| | | | | | | | | | - Add interface command - Improve scan handling during P2P BUG: b/6324527, b/6427094 Change-Id: I4425f44d2a15de0725ba4a1b42cc56e10954b314 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* Merge "Add SSID in supplicant change event"Irfan Sheriff2012-04-162-4/+8
|\
| * Add SSID in supplicant change eventIrfan Sheriff2012-04-162-4/+8
| | | | | | | | Change-Id: I67224e6765afad51b4b258b0df7d11d7ed3b9927
* | wpa_supplicant: Fix CONFIG_NO_ROAMING optionDmitry Shmidt2012-04-131-1/+1
|/ | | | | Change-Id: I9d4c2c59179f92c82b4a6d8a5b503db8dd859e2c Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* Merge "P2P: Clear P2P_DEV_SD_INFO when new wildcard SD query is added"Irfan Sheriff2012-04-121-0/+6
|\
| * P2P: Clear P2P_DEV_SD_INFO when new wildcard SD query is addedIrfan Sheriff2012-04-111-0/+6
| | | | | | | | | | | | | | | | | | Unlike the unicast SD queries, the queries directed to all peers depend on P2P_DEV_SD_INFO flag being cleared to allow the query to be sent to a peer that has previously replied to any SD query. Change-Id: I1ea3df2ea8df75af3b65d3ffa0c38658d3e3d1ef Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
* | Merge "Revert "Fix service discovery add""Irfan Sheriff2012-04-121-9/+0
|\|
| * Revert "Fix service discovery add"Irfan Sheriff2012-04-111-9/+0
| | | | | | | | This reverts commit 40fa98b45e4e61fcf0cb9292fdf8882b0624bd35.
* | Allow legacy PS param to be set with SET in addition to P2P_SETJouni Malinen2012-04-101-0/+2
| | | | | | | | | | Change-Id: I26e19c7d9e303e075f28a4f01a798ac98b52d6e5 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | Merge "Add to bss command option RANGE=ALL|N1-N2 [MASK=0xH]"Dmitry Shmidt2012-04-093-126/+279
|\ \ | |/ |/|
| * Add to bss command option RANGE=ALL|N1-N2 [MASK=0xH]Dmitry Shmidt2012-03-263-126/+279
| | | | | | | | | | | | | | Add to bss command ability to get information about several bss's in one call and to limit amount of fields Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | Merge "P2P: Use P2P Device ID attribute if Device Info not available"Irfan Sheriff2012-04-061-5/+8
|\ \
| * | P2P: Use P2P Device ID attribute if Device Info not availableIrfan Sheriff2012-04-061-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "BSS p2p_dev_addr=address" command uses p2p_parse_dev_addr() to figure out the P2P Device Address of the GO from scan results. This used to work only if the P2P IE was received from Probe Response frames since only those include the P2P Device Info attribute. Make this work with Beacon frames, too, by using P2P Device ID attribute if the P2P Device Info attribute is not present. Change-Id: I3f0a49c22ee02e8971edb9ecd033e74342c318c0 Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
* | | Fix service discovery addIrfan Sheriff2012-04-041-0/+9
|/ / | | | | | | Change-Id: If621eef6e7a16c83ae520650b8216a5f63488403
* | Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\ \ | |/ |/|
| * keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\
| | * undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\
| | | * reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | |/| | |/|/
* | | Update to Version 0.8.24 from BRCMDmitry Shmidt2012-03-265-18/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add 'conc_priority' command - Fix handling a single channel concurrency case: If conc_priority is not set, advertise the frequency conflict to the framework and disable the new connection attempted - When P2P Interface gets removed due to single channel frequency conflict, show GROUP_REMOVE reason=FREQ_CONFLICT - Fix sched scan processing Change-Id: Ie6fe105cebd379a0a9c49ace62d2e48e71571107 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | Use keystore ENGINE for private key operationsKenny Root2012-03-211-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new keystore ENGINE is usable to perform private key operations when we can't get the actual private key data. This is the case when hardware crypto is enabled: the private key never leaves the hardware. Subsequently, we need to be able to talk to OpenSSL ENGINEs that aren't PKCS#11 or OpenSC. This just changes a few #define variables to allow us to talk to our keystore engine without having one of those enabled and without using a PIN. Change-Id: Iabab5077c3d167a1e13bc8ef8745dc59ad4d62f7
* | | nl80211: Use native cfg80211 sta eventsDmitry Shmidt2012-03-201-111/+17
| | | | | | | | | | | | | | | Change-Id: Id59cc4af50dbccd283db2ec3e7b0b6f8c2146e68 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | Restore OpenSSL ENGINE supportKenny Root2012-03-202-6/+0
| | | | | | | | | | | | | | | | | | We now use an OpenSSL ENGINE to support keystore functionality. Change-Id: Ifa654183a86462e1542c58dd39e20ffe11a8edfa
* | | Update to new version 0.8.22 from BRCMDmitry Shmidt2012-03-06487-4454/+3941
| | | | | | | | | | | | | | | | | | | | | | | | - Based on 0c01d65 : Ignore TX status for Data frames from not associated STA Change-Id: I2776ff8e292593f407bf5b9177640c512e06bf0d Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | Merge "hostapd: Enable CONFIG_IEEE80211N option"Dmitry Shmidt2012-02-281-1/+1
|\ \ \
| * | | hostapd: Enable CONFIG_IEEE80211N optionDmitry Shmidt2012-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I86868ac9efa1192c96110c114bfcba25c02d1ae6 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | Merge changes If51126b8,I05322cf0Dmitry Shmidt2012-02-228-898/+898
|\| | | | | | | | | | | | | | | | | | | | | | | * changes: wpa_supplicant: Change wpa_supplicant.conf template name Move .config for Android to android.config