aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Guard against return value already being nullstable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2KPaul Stewart2016-05-031-2/+4
* Remove newlines from config outputPaul Stewart2016-05-031-2/+10
* wpa_supplicant: Force the p2p channels to reuse frequencies used by STADiogo Ferreira2016-04-184-1/+93
* wpa_supplicant_conf: Let devices provide their own templateRicardo Cerqueira2016-04-151-1/+1
* eap: Don't force reassociation when getting the identity and handshakes are i...Ricardo Cerqueira2016-04-041-1/+5
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/ex...staging/cm-13.0+r22Steve Kondik2016-03-100-0/+0
|\
| * Merge "WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use...Dmitry Shmidt2015-11-091-0/+6
| |\
| | * Merge "WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use...Dmitry Shmidt2015-11-091-0/+6
| | |\
| | | * Merge "WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use...Dmitry Shmidt2015-11-091-0/+6
| | | |\
| | | | * Merge "WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use...Dmitry Shmidt2015-11-091-0/+6
| | | | |\
| | | | | * Merge "WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use...Dmitry Shmidt2015-11-091-0/+6
| | | | | |\
| | | | | | * Merge "WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use...Dmitry Shmidt2015-11-091-0/+6
| | | | | | |\
| | | | | | | * Merge "WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use...Dmitry Shmidt2015-11-091-0/+6
| | | | | | | |\
| | | | | | | | * WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in useJouni Malinen2015-11-061-0/+6
| * | | | | | | | Merge "EAP-pwd server: Fix last fragment length validation" into klp-dev am: ...Dmitry Shmidt2015-11-091-3/+3
| |\| | | | | | |
| | * | | | | | | Merge "EAP-pwd server: Fix last fragment length validation" into klp-dev am: ...Dmitry Shmidt2015-11-091-3/+3
| | |\| | | | | |
| | | * | | | | | Merge "EAP-pwd server: Fix last fragment length validation" into klp-dev am: ...Dmitry Shmidt2015-11-091-3/+3
| | | |\| | | | |
| | | | * | | | | Merge "EAP-pwd server: Fix last fragment length validation" into klp-dev am: ...Dmitry Shmidt2015-11-091-3/+3
| | | | |\| | | |
| | | | | * | | | Merge "EAP-pwd server: Fix last fragment length validation" into klp-dev am: ...Dmitry Shmidt2015-11-091-3/+3
| | | | | |\| | |
| | | | | | * | | Merge "EAP-pwd server: Fix last fragment length validation" into klp-devDmitry Shmidt2015-11-091-3/+3
| | | | | | |\| |
| | | | | | | * | Merge "EAP-pwd server: Fix last fragment length validation" into klp-devDmitry Shmidt2015-11-091-3/+3
| | | | | | | |\ \
| | | | | | | | * | EAP-pwd server: Fix last fragment length validationJouni Malinen2015-11-061-3/+3
| | | | | | | | |/
| * | | | | | | | EAP-pwd peer: Fix last fragment length validation am: 3aa9ad54b1 am: 9c5ac8d9...Jouni Malinen2015-11-091-4/+3
| |\| | | | | | |
| | * | | | | | | EAP-pwd peer: Fix last fragment length validation am: 3aa9ad54b1 am: 9c5ac8d9...Jouni Malinen2015-11-091-4/+3
| | |\| | | | | |
| | | * | | | | | EAP-pwd peer: Fix last fragment length validation am: 3aa9ad54b1 am: 9c5ac8d9...Jouni Malinen2015-11-091-4/+3
| | | |\| | | | |
| | | | * | | | | EAP-pwd peer: Fix last fragment length validation am: 3aa9ad54b1 am: 9c5ac8d9a4Jouni Malinen2015-11-091-4/+3
| | | | |\| | | |
| | | | | * | | | EAP-pwd peer: Fix last fragment length validation am: 3aa9ad54b1Jouni Malinen2015-11-091-4/+3
| | | | | |\| | |
| | | | | | * | | EAP-pwd peer: Fix last fragment length validationJouni Malinen2015-11-091-4/+3
| | | | | | |\| |
| | | | | | | * | EAP-pwd peer: Fix last fragment length validationJouni Malinen2015-11-061-4/+3
| | | | | | | |/
* | | | | | | | Merge branch 'LA.BF.1.1.3_rb1.9' of git://codeaurora.org/platform/external/wp...Steve Kondik2016-02-123-11/+26
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge AU_LINUX_ANDROID_LA.BF.1.1.3_RB1.06.00.01.181.008 on remote branchLinux Build Service Account2016-01-220-0/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge AU_LINUX_ANDROID_LA.BF.1.1.3_RB1.06.00.01.181.007 on remote branchLinux Build Service Account2016-01-090-0/+0
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | EAP-pwd server: Fix last fragment length validationJouni Malinen2016-01-080-0/+0
| * | | | | | | | | | EAP-pwd peer: Fix last fragment length validationJouni Malinen2016-01-080-0/+0
| |/ / / / / / / / /
| * | | | | | | | | P2P: Filter control chars in group client device name similarly to peerHu Wang2015-12-283-11/+26
* | | | | | | | | | Merge branch 'LA.BF.1.1.3_rb1.7' of git://codeaurora.org/platform/external/wp...Steve Kondik2016-01-0810-65/+148
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge AU_LINUX_ANDROID_LA.BF.1.1.3_RB1.06.00.00.181.006 on remote branchLinux Build Service Account2015-12-280-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | EAP-pwd peer: Fix error path for unexpected Confirm messageJouni Malinen2015-11-261-1/+2
| | * | | | | | | | EAP-pwd server: Fix last fragment length validationJouni Malinen2015-11-261-3/+3
| | * | | | | | | | EAP-pwd peer: Fix last fragment length validationJouni Malinen2015-11-261-4/+3
| | * | | | | | | | Merge "WNM: Ignore WNM-Sleep Mode Response if WNM-Sleep Mode has not been used"Linux Build Service Account2015-11-244-0/+11
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge "EAP-pwd peer: Fix error path for unexpected Confirm message"Linux Build Service Account2015-12-111-1/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | EAP-pwd peer: Fix error path for unexpected Confirm messageJouni Malinen2015-11-111-1/+2
| * | | | | | | | | | | Merge "EAP-pwd server: Fix last fragment length validation"Linux Build Service Account2015-12-116-7/+17
| |\| | | | | | | | | |
| | * | | | | | | | | | EAP-pwd server: Fix last fragment length validationJouni Malinen2015-11-111-3/+3
| | * | | | | | | | | | EAP-pwd peer: Fix last fragment length validationJouni Malinen2015-11-111-4/+3
| | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | WNM: Ignore WNM-Sleep Mode Response if WNM-Sleep Mode has not been usedJouni Malinen2015-11-114-0/+11
| * | | | | | | | | | Merge "WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use"Linux Build Service Account2015-12-111-0/+6
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in useJouni Malinen2015-11-161-0/+6
| | |/ / / / / / / /
| * | | | | | | | | Merge tag 'android-6.0.1_r3' into 601r3David Ng2015-12-093-11/+302
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |