summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.4.3_r1' into HEADcm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0Ricardo Cerqueira2014-06-0316-243/+353
|\
| * DO NOT MERGE: Support translating fragmented packets.Lorenzo Colitti2014-03-106-35/+126
| * DO NOT MERGE: Modify the pseudo-header checksum functions.Lorenzo Colitti2014-03-105-18/+18
| * DO NOT MERGE: Move translation entry point into translate.c.Lorenzo Colitti2014-03-106-91/+73
| * DO NOT MERGE: Fix up checksums instead of recalculating them.Lorenzo Colitti2014-03-106-36/+87
| * DO NOT MERGE: Add generic IP packet code and use it for GRE.Lorenzo Colitti2014-03-104-6/+29
| * DO NOT MERGE: Fix compiler warnings and enable -Wall -WerrorLorenzo Colitti2014-03-105-12/+12
| * DO NOT MERGE: Remove unused variablesBernhard Rosenkränzer2014-03-105-6/+2
| * DO NOT MERGE: Remove two almost-unused include files.Lorenzo Colitti2014-03-106-54/+4
| * Merge "Revert "DO NOT MERGE: Remove two almost-unused include files."" into k...Lorenzo Colitti2014-03-086-4/+54
| |\
| | * Revert "DO NOT MERGE: Remove two almost-unused include files."Lorenzo Colitti2014-03-086-4/+54
| * | Merge "Revert "DO NOT MERGE: Remove unused variables"" into klp-devLorenzo Colitti2014-03-085-2/+6
| |\ \
| | * | Revert "DO NOT MERGE: Remove unused variables"Lorenzo Colitti2014-03-085-2/+6
| * | | Merge "Revert "DO NOT MERGE: Fix compiler warnings and enable -Wall -Werror""...Lorenzo Colitti2014-03-085-12/+12
| |\ \ \
| | * | | Revert "DO NOT MERGE: Fix compiler warnings and enable -Wall -Werror"Lorenzo Colitti2014-03-085-12/+12
| * | | | Merge "Revert "DO NOT MERGE: Add generic IP packet code and use it for GRE.""...Lorenzo Colitti2014-03-084-29/+6
| |\ \ \ \
| | * | | | Revert "DO NOT MERGE: Add generic IP packet code and use it for GRE."Lorenzo Colitti2014-03-084-29/+6
| * | | | | Merge "Revert "DO NOT MERGE: Fix up checksums instead of recalculating them."...Lorenzo Colitti2014-03-086-87/+36
| |\ \ \ \ \
| | * | | | | Revert "DO NOT MERGE: Fix up checksums instead of recalculating them."Lorenzo Colitti2014-03-086-87/+36
| * | | | | | Merge "Revert "DO NOT MERGE: Move translation entry point into translate.c.""...Lorenzo Colitti2014-03-086-73/+91
| |\ \ \ \ \ \
| | * | | | | | Revert "DO NOT MERGE: Move translation entry point into translate.c."Lorenzo Colitti2014-03-086-73/+91
| * | | | | | | Merge "Revert "DO NOT MERGE: Modify the pseudo-header checksum functions."" i...Lorenzo Colitti2014-03-085-18/+18
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "DO NOT MERGE: Modify the pseudo-header checksum functions."Lorenzo Colitti2014-03-085-18/+18
| * | | | | | | | Revert "DO NOT MERGE: Support translating fragmented packets."Lorenzo Colitti2014-03-086-126/+35
| * | | | | | | | DO NOT MERGE: Support translating fragmented packets.Lorenzo Colitti2014-03-096-35/+126
| |/ / / / / / /
| * / / / / / / DO NOT MERGE: Modify the pseudo-header checksum functions.Lorenzo Colitti2014-03-095-18/+18
| |/ / / / / /
| * / / / / / DO NOT MERGE: Move translation entry point into translate.c.Lorenzo Colitti2014-03-096-91/+73
| |/ / / / /
| * / / / / DO NOT MERGE: Fix up checksums instead of recalculating them.Lorenzo Colitti2014-03-096-36/+87
| |/ / / /
| * / / / DO NOT MERGE: Add generic IP packet code and use it for GRE.Lorenzo Colitti2014-03-094-6/+29
| |/ / /
| * / / DO NOT MERGE: Fix compiler warnings and enable -Wall -WerrorLorenzo Colitti2014-03-095-12/+12
| |/ /
| * / DO NOT MERGE: Remove unused variablesBernhard Rosenkränzer2014-03-095-6/+2
| |/
| * DO NOT MERGE: Remove two almost-unused include files.Lorenzo Colitti2014-03-096-54/+4
| * Add ip6 dummy address to keep data usage stats consistent.JP Abgrall2014-03-074-1/+18
| * am 3b0d387b: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-07-110-0/+0
| |\
| | * Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-07-090-0/+0
| | |\
| | | * Remove debug tag from the clatd.conf build targetLorenzo Colitti2013-07-091-1/+0
* | | | Merge tag 'android-4.4_r1' into cm-11.0cm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eaRicardo Cerqueira2013-11-010-0/+0
|\| | |
| * | | am 0d7837b9: Remove debug tag from the clatd.conf build targetLorenzo Colitti2013-07-080-0/+0
| |\| |
| * | | Remove debug tag from the clatd.conf build targetLorenzo Colitti2013-07-081-1/+0
| | |/ | |/|
* | | Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Ricardo Cerqueira2013-07-2441-0/+4052
|\ \ \ | | |/ | |/|
| * | Remove debug tag from the clatd.conf build targetLorenzo Colitti2013-07-091-1/+0
| |/
| * Support translating ICMP errors.Lorenzo Colitti2013-04-127-46/+331
| * Improve checksum calculation and address checkingLorenzo Colitti2013-04-125-80/+114
| * Pass around packet data instead of fdsLorenzo Colitti2013-04-129-467/+383
| * Merge "Treat the options as part of the TCP header." into jb-mr2-devLorenzo Colitti2013-04-124-82/+61
| |\
| | * Treat the options as part of the TCP header.Lorenzo Colitti2013-04-124-82/+61
| * | Merge "Slightly improve dumping packets" into jb-mr2-devLorenzo Colitti2013-04-112-4/+14
| |\|
| | * Slightly improve dumping packetsLorenzo Colitti2013-04-102-4/+14
| * | Merge "Pass in the length to pseudo checksum functions" into jb-mr2-devLorenzo Colitti2013-04-114-33/+35
| |\|
| | * Pass in the length to pseudo checksum functionsLorenzo Colitti2013-04-094-33/+35
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 14:47:33 +0000