aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * nl80211: Sync with mac80211-next.gitJouni Malinen2014-06-121-0/+17
| * nl80211: Sync with wireless-testing.gitJouni Malinen2014-06-122-19/+102
| * Increase global ctrl_iface buffer to same size as per-interfaceJouni Malinen2014-06-121-1/+1
| * Sync with wireless-testing.git include/uapi/linux/nl80211.hJouni Malinen2014-06-121-25/+218
| * nl80211: Make wpa_driver_nl80211_data::first_bss pointerKyeyoon Park2014-06-121-46/+56
| * Make frequency range list routines more generalJouni Malinen2014-06-126-55/+120
| * P2P: Extend the listen time based on the active concurrent sessionRashmi Ramanna2014-06-123-6/+31
| * Do not use results from externally requested scan for network selectionJouni Malinen2014-06-121-0/+6
| * Ignore externally triggered scan results with scan_res_handler.Jouni Malinen2014-06-121-1/+2
| * Track whether scan was started by us or an external programJouni Malinen2014-06-128-2/+37
| * P2P: Clear pending group formation data on group removalJouni Malinen2014-06-121-0/+4
| * hostapd: Make install path configurablePrashanth Bhatta2014-06-121-3/+6
| * wpa_supplicant_8: Don't expire peers when in P2P_PENDING_PD.Sunil Dutt2014-06-121-0/+2
| * P2P: Fix channel preference use for MCC p2p_connectJouni Malinen2014-06-121-1/+2
| * eap_proxy: Extend Android.mk to support additional librariesNaresh Jayaram2014-06-121-1/+5
| * TDLS: Do not reenable TDLS link on retransmitted setup frameSunil Dutt2014-06-121-13/+29
* | Merge remote-tracking branch 'github/cm-11.0' into HEADcm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eaBrint E. Kriebel2014-02-282-1/+8
|\|
| * capabilities ERANG error fixMichael Gernoth2014-02-142-1/+8
* | Merge remote-tracking branch 'github/cm-11.0' into HEADBrint E. Kriebel2014-01-311-2/+0
|\|
| * Revert "p2p: Add p2p_no_group_iface flag to p2p conf file"Steve Kondik2014-01-211-2/+0
* | Merge remote-tracking branch 'github/cm-11.0' into HEADbuild04@build042013-12-2726-108/+532
|\|
| * Merge branch 'kk_2.7_rb1.15' of git://codeaurora.org/platform/external/wpa_su...Steve Kondik2013-12-1326-108/+500
| |\
| | * Revert "Add Support for proprietary EAP-PROXY implementation."Naresh Jayaram2013-12-091-5/+1
| | * Merge "Add Support for proprietary EAP-PROXY implementation."Linux Build Service Account2013-12-071-1/+5
| | |\
| | | * Add Support for proprietary EAP-PROXY implementation.Naresh Jayaram2013-12-051-1/+5
| | * | Merge "Merge commit 'android-4.4.1_r1' into merge_branch"Linux Build Service Account2013-12-074-0/+32
| | |\ \
| | | * | Merge commit 'android-4.4.1_r1' into merge_branchManish Kumar2013-12-054-0/+32
| | |/| |
| | * | | Merge "Android: Implement SETBAND for scan requests"Linux Build Service Account2013-12-051-1/+21
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Android: Implement SETBAND for scan requestsJouni Malinen2013-12-021-1/+21
| | |/ /
| | * | Merge "P2P: Short scan wait to speed up the group re-invocation"Linux Build Service Account2013-11-232-4/+6
| | |\ \
| | | * | P2P: Short scan wait to speed up the group re-invocationRashmi Ramanna2013-11-222-4/+6
| | * | | Merge "hostapd: Filter channel list updated events after country code change"Linux Build Service Account2013-11-235-5/+47
| | |\ \ \
| | | * | | hostapd: Filter channel list updated events after country code changeAbhishek Singh2013-11-205-5/+47
| | * | | | Merge "hostapd: Wait for channel list update after country code change"Linux Build Service Account2013-11-236-1/+127
| | |\| | |
| | | * | | hostapd: Wait for channel list update after country code changeJouni Malinen2013-11-206-1/+127
| | * | | | Merge "P2P: Avoid frequency conflict due to blocking of lower 5GHz channels"Linux Build Service Account2013-11-223-38/+0
| | |\ \ \ \
| | | * | | | P2P: Avoid frequency conflict due to blocking of lower 5GHz channelsVinay Krishna Eranna2013-11-223-38/+0
| | |/ / / /
| | * | | | Merge "P2P: Use negotiated channel from invitation for persistent GO"Linux Build Service Account2013-11-214-6/+23
| | |\ \ \ \
| | | * | | | P2P: Use negotiated channel from invitation for persistent GOVinay Krishna Eranna2013-11-214-6/+23
| | | | |/ / | | | |/| |
| | * | | | Merge "Interworking: Report STATUS:sp_type even if domain is not configured"Linux Build Service Account2013-11-212-4/+5
| | |\ \ \ \
| | | * | | | Interworking: Report STATUS:sp_type even if domain is not configuredJouni Malinen2013-11-182-4/+5
| | * | | | | Merge "Interworking: Add support for multiple home FQDNs"Linux Build Service Account2013-11-217-26/+65
| | |\| | | |
| | | * | | | Interworking: Add support for multiple home FQDNsJouni Malinen2013-11-197-26/+65
| | | | |/ / | | | |/| |
| | * | | | Merge "Update regulatory change to all virtual interface for the phy"Linux Build Service Account2013-11-211-10/+46
| | |\ \ \ \
| | | * | | | Update regulatory change to all virtual interface for the phyVinay Krishna Eranna2013-11-171-10/+46
| | | |/ / /
| | * | | | Merge "Interworking: Reject BSS based on disallow_aps"Linux Build Service Account2013-11-211-0/+16
| | |\ \ \ \
| | | * | | | Interworking: Reject BSS based on disallow_apsJouni Malinen2013-11-141-0/+16
| | * | | | | Merge "Interworking: Avoid duplicated network blocks"Linux Build Service Account2013-11-211-1/+41
| | |\| | | |
| | | * | | | Interworking: Avoid duplicated network blocksJouni Malinen2013-11-131-1/+41
| | * | | | | Merge "Interworking: Do not reconnect if already connected"Linux Build Service Account2013-11-212-0/+40
| | |\| | | | | | | |_|/ / | | |/| | |