aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | Interworking: Do not reconnect if already connectedJouni Malinen2013-11-132-0/+40
| | * | | | Merge "Include Extended Capabilities element based on scan results"Linux Build Service Account2013-11-201-11/+21
| | |\ \ \ \
| | | * | | | Include Extended Capabilities element based on scan resultsArif Hussain2013-11-141-11/+21
| | | |/ / /
| | * | | | Merge "P2P: Make sure wait for the first client gets stopped"Linux Build Service Account2013-11-201-0/+6
| | |\ \ \ \
| | | * | | | P2P: Make sure wait for the first client gets stoppedJouni Malinen2013-11-131-0/+6
| | * | | | | Merge "P2P: Use group formation timeout on persistent group GO"Linux Build Service Account2013-11-205-6/+41
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | P2P: Use group formation timeout on persistent group GOJouni Malinen2013-11-145-6/+41
| | | | |/ / | | | |/| |
| * | | | | Merge tag 'android-4.4.1_r1' into HEADRicardo Cerqueira2013-12-074-0/+32
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | TDLS: Provide external control to specify the peers for setup (DO NOT MERGE)Naresh Jayaram2013-11-144-0/+26
| | * | | | Prohibit pno start during assoc process and in connect stateDmitry Shmidt2013-11-071-0/+6
| | * | | | Fix ENABLE_NETWORK not to reconnect in disconnected state (DO NOT MERGE)Jouni Malinen2013-10-241-2/+2
| | * | | | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| | |\ \ \ \
| * | | | | | eap_proxy: Add context data pointer to the get_imsi callNaresh Jayaram2013-12-073-3/+5
| * | | | | | eap_proxy: Re-read IMSI from proxy in Interworking functionalityNaresh Jayaram2013-12-071-0/+18
| * | | | | | eap_proxy: Confirm eap_proxy initialization before reading SIM infoNaresh Jayaram2013-12-073-1/+15
| * | | | | | P2P: Clear p2p_group_formation and p2p_in_provisioning on group removalDeepthi Gowri2013-12-071-0/+5
| * | | | | | P2P Extend postponing of concurrent scans for persistent GODeepthi Gowri2013-12-071-0/+1
| * | | | | | P2P: Extend group formation timeout on GO to first data connectionJouni Malinen2013-12-072-4/+36
| * | | | | | P2P: Cancel group formation timeout on client connectionJouni Malinen2013-12-071-0/+10
| * | | | | | P2P: Increase Invitation Request timeoutsSwaroop Golti2013-12-071-2/+3
| * | | | | | Fix ENABLE_NETWORK not to reconnect in disconnected stateJouni Malinen2013-12-071-2/+2
| * | | | | | P2P: Allow persistent group determination based on Beacon frameJouni Malinen2013-12-071-0/+3
| * | | | | | P2P: Do not allow P2P client connection without P2P IE from GOJouni Malinen2013-12-071-0/+7
| * | | | | | P2P: Do not drop P2P IEs from BSS table on non-P2P scansJouni Malinen2013-12-071-0/+16
| * | | | | | P2P: Allow GO to be discovered based on Beacon frameJouni Malinen2013-12-073-2/+56
| * | | | | | P2P: Show p2p flag in debug info for scan resultsJouni Malinen2013-12-071-2/+5
| * | | | | | P2P: Show P2P flag in BSS entries also based on Beacon framesJouni Malinen2013-12-073-1/+43
| * | | | | | p2p: Add p2p_no_group_iface flag to p2p conf fileHardik Kantilal Patel2013-12-071-0/+2
| * | | | | | Use configured sched_scan interval for the PNO scanKamath Vinayak2013-12-071-2/+5
| * | | | | | WPS: Ignore PBC-to-PIN change from M1 to M2 as a workaroundJouni Malinen2013-12-071-0/+6
| * | | | | | Android: Add PMF support to hostapd buildJouni Malinen2013-12-071-1/+1
| * | | | | | Enabling the HS2.0 functionality in the default config fileReddy Chirala Leela Venkata Kiran Kumar2013-12-071-2/+2
| * | | | | | Android: Enable IEEE 802.11r in wpa_supplicant buildsDeepthi Gowri2013-12-071-1/+1
| * | | | | | Android: Enable IEEE 802.11w support in the buildChet Lanctot2013-12-071-1/+1
| * | | | | | Android: Enable WNM in the buildJouni Malinen2013-12-071-1/+1
| * | | | | | wpa_supplicant_8: Remove android specific handling for assoc reject eventsDeepthi Gowri2013-12-073-79/+0
* | | | | | | Merge branch 'kk_2.7_rb1.10' of git://codeaurora.org/platform/external/wpa_su...Steve Kondik2013-11-2420-101/+241
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Merge "eap_proxy: Add context data pointer to the get_imsi call"Linux Build Service Account2013-11-153-3/+5
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | eap_proxy: Add context data pointer to the get_imsi callNaresh Jayaram2013-11-133-3/+5
| |/ / / /
| * | | | Merge "eap_proxy: Re-read IMSI from proxy in Interworking functionality"Linux Build Service Account2013-11-131-0/+18
| |\ \ \ \
| | * | | | eap_proxy: Re-read IMSI from proxy in Interworking functionalityNaresh Jayaram2013-11-121-0/+18
| * | | | | Merge "eap_proxy: Confirm eap_proxy initialization before reading SIM info"Linux Build Service Account2013-11-133-1/+15
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | eap_proxy: Confirm eap_proxy initialization before reading SIM infoNaresh Jayaram2013-11-123-1/+15
| | |/ / /
| * | | | Merge "P2P: Clear p2p_group_formation and p2p_in_provisioning on group removal"Linux Build Service Account2013-11-131-0/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | P2P: Clear p2p_group_formation and p2p_in_provisioning on group removalDeepthi Gowri2013-11-071-0/+5
| * | | | Merge "P2P Extend postponing of concurrent scans for persistent GO"Linux Build Service Account2013-11-081-0/+1
| |\| | |
| | * | | P2P Extend postponing of concurrent scans for persistent GODeepthi Gowri2013-11-071-0/+1
| * | | | Merge "P2P: Extend group formation timeout on GO to first data connection"Linux Build Service Account2013-11-082-4/+36
| |\| | |
| | * | | P2P: Extend group formation timeout on GO to first data connectionJouni Malinen2013-11-072-4/+36
| * | | | Merge "P2P: Cancel group formation timeout on client connection"Linux Build Service Account2013-11-081-0/+10
| |\| | |