aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jb_mr2' of git://codeaurora.org/platform/external/wpa_supplican...cm-10.2.1cm-10.2.0stable/cm-10.2cm-10.2Steve Kondik2013-11-0716-35/+316
|\
| * Merge "P2P: Make sure wait for the first client gets stopped"Linux Build Service Account2013-11-041-0/+6
| |\
| | * P2P: Make sure wait for the first client gets stoppedJouni Malinen2013-10-301-0/+6
| * | Merge "WPS: Allow Device Password Id changes between PIN methods"Linux Build Service Account2013-11-041-0/+18
| |\|
| | * WPS: Allow Device Password Id changes between PIN methodsJouni Malinen2013-10-301-0/+18
| * | Merge "Fix ENABLE_NETWORK not to reconnect in disconnected state"Linux Build Service Account2013-11-041-2/+2
| |\ \
| | * | Fix ENABLE_NETWORK not to reconnect in disconnected stateJouni Malinen2013-10-251-2/+2
| * | | Merge "Set GTK rekey offload information after initial group key handshake"Linux Build Service Account2013-11-021-3/+5
| |\ \ \
| | * | | Set GTK rekey offload information after initial group key handshakeSunil Dutt2013-10-311-3/+5
| * | | | Merge "Update regulatory change to all virtual interface for the phy"Linux Build Service Account2013-11-021-10/+46
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update regulatory change to all virtual interface for the phyVinay Krishna Eranna2013-10-311-10/+46
| |/ / /
| * | | Merge "Merge "hostapd: Make install path configurable""Linux Build Service Account2013-10-250-0/+0
| |\| |
| * | | Merge "hostapd: Make install path configurable"Linux Build Service Account2013-10-250-0/+0
| |\ \ \
| * \ \ \ Merge "P2P: Clear p2p_group_formation and p2p_in_provisioning on group removal"Linux Build Service Account2013-10-250-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge "P2P Extend postponing of concurrent scans for persistent GO"Linux Build Service Account2013-10-250-0/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge "hostapd: Make install path configurable"Linux Build Service Account2013-10-241-3/+6
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | hostapd: Make install path configurablePrashanth Bhatta2013-10-141-3/+6
| * | | | Merge "P2P: Clear p2p_group_formation and p2p_in_provisioning on group removal"Linux Build Service Account2013-10-241-0/+5
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | P2P: Clear p2p_group_formation and p2p_in_provisioning on group removalDeepthi Gowri2013-10-221-0/+5
| | | |/ | | |/|
| * | | Merge "P2P Extend postponing of concurrent scans for persistent GO"Linux Build Service Account2013-10-241-0/+1
| |\| |
| | * | P2P Extend postponing of concurrent scans for persistent GODeepthi Gowri2013-10-221-0/+1
| * | | Merge "P2P: Allow persistent group determination based on Beacon frame"Linux Build Service Account2013-10-241-0/+3
| |\ \ \
| | * | | P2P: Allow persistent group determination based on Beacon frameJouni Malinen2013-10-181-0/+3
| * | | | Merge "P2P: Do not allow P2P client connection without P2P IE from GO"Linux Build Service Account2013-10-241-0/+7
| |\| | |
| | * | | P2P: Do not allow P2P client connection without P2P IE from GOJouni Malinen2013-10-181-0/+7
| * | | | Merge "P2P: Do not drop P2P IEs from BSS table on non-P2P scans"Linux Build Service Account2013-10-241-0/+16
| |\| | |
| | * | | P2P: Do not drop P2P IEs from BSS table on non-P2P scansJouni Malinen2013-10-181-0/+16
| * | | | Merge "P2P: Allow GO to be discovered based on Beacon frame"Linux Build Service Account2013-10-243-2/+56
| |\| | |
| | * | | P2P: Allow GO to be discovered based on Beacon frameJouni Malinen2013-10-183-2/+56
| * | | | Merge "P2P: Show p2p flag in debug info for scan results"Linux Build Service Account2013-10-241-2/+5
| |\ \ \ \
| | * | | | P2P: Show p2p flag in debug info for scan resultsJouni Malinen2013-10-181-2/+5
| | |/ / /
| * | / / Merge "P2P: Show P2P flag in BSS entries also based on Beacon frames"Linux Build Service Account2013-10-243-1/+43
| |\| | | | | |/ / | |/| |
| | * | P2P: Show P2P flag in BSS entries also based on Beacon framesJouni Malinen2013-10-183-1/+43
| * | | Merge "Add disable_scan_offload parameter to wpa_supplicant.conf"Linux Build Service Account2013-10-170-0/+0
| |\ \ \ | | |/ / | |/| |
| * | | Merge "Add disable_scan_offload parameter to wpa_supplicant.conf"Linux Build Service Account2013-10-161-0/+1
| |\| |
| | * | Add disable_scan_offload parameter to wpa_supplicant.confHardik Kantilal Patel2013-10-151-0/+1
| | |/
| * | Merge "P2P: Increase Invitation Request timeouts"Linux Build Service Account2013-10-151-2/+2
| |\ \
| | * | P2P: Increase Invitation Request timeoutsSwaroop Golti2013-10-101-2/+2
| | |/
| * | Merge "TDLS: Tear down TDLS using wpas_drv_tlds_oper() if not external"Linux Build Service Account2013-10-151-2/+9
| |\ \
| | * | TDLS: Tear down TDLS using wpas_drv_tlds_oper() if not externalArend van Spriel2013-10-081-2/+9
| | |/
| * | Merge "P2P: Use group formation timeout on persistent group GO"Linux Build Service Account2013-10-155-6/+41
| |\ \
| | * | P2P: Use group formation timeout on persistent group GOJouni Malinen2013-10-075-6/+41
| * | | Merge "P2P: Extend group formation timeout on GO to first data connection"Linux Build Service Account2013-10-152-4/+36
| |\| |
| | * | P2P: Extend group formation timeout on GO to first data connectionJouni Malinen2013-10-072-4/+36
| * | | Merge "P2P: Cancel group formation timeout on client connection"Linux Build Service Account2013-10-151-0/+10
| |\| | | | |/ | |/|
| | * P2P: Cancel group formation timeout on client connectionJouni Malinen2013-10-041-0/+10
* | | Disable 802.11w hooks in the wext drivercm-10.2-M1Ricardo Cerqueira2013-10-211-2/+2
* | | Merge branch 'jb_mr2' of git://codeaurora.org/platform/external/wpa_supplican...Steve Kondik2013-10-0743-428/+1569
|\| |
| * | Merge "TDLS: Do not start concurrent TDLS setup"Linux Build Service Account2013-10-041-0/+11
| |\ \
| | * | TDLS: Do not start concurrent TDLS setupSunil Dutt2013-10-031-0/+11
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 17:02:35 +0000