summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am ca1976f4: am 9fbed20c: am 624e743c: am 8dccd379: am 05ff508a: Remove ↵android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseChih-Hung Hsieh2015-03-260-0/+0
|\ | | | | | | | | | | unused variables. * commit 'ca1976f4a486d48d5e96ac0bfa16560820bea777':
| * am 9fbed20c: am 624e743c: am 8dccd379: am 05ff508a: Remove unused variables.Chih-Hung Hsieh2015-03-260-0/+0
| |\ | | | | | | | | | * commit '9fbed20c70b0fd51c2e92e8073cf860d1a650af8':
| | * am 624e743c: am 8dccd379: am 05ff508a: Remove unused variables.Chih-Hung Hsieh2015-03-260-0/+0
| | |\ | | | | | | | | | | | | * commit '624e743cbfacffb4e1691138f97bd4980a76ac02':
* | | | am ea2105a3: am ce88200a: am 23d83ff2: am cca70d8b: am dce3ddf5: Call read ↵Lorenzo Colitti2015-03-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | on any event, not just on POLLIN. * commit 'ea2105a379cc829e3265ce5c37710c47b80dbd48':
| * | | am ce88200a: am 23d83ff2: am cca70d8b: am dce3ddf5: Call read on any event, ↵Lorenzo Colitti2015-03-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | not just on POLLIN. * commit 'ce88200a81198d1079c9364365e2aed152b7c365':
| | * | am 23d83ff2: am cca70d8b: am dce3ddf5: Call read on any event, not just on ↵Lorenzo Colitti2015-03-260-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | POLLIN. * commit '23d83ff24853d74fe03de96bae23b17655f4546b':
* | | | | am 8e8840a4: am 917b21a7: am 5105819c: am 8a20092a: am 545bdca4: Remove ↵Elliott Hughes2015-03-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | unused #include. * commit '8e8840a421d585d0e0b698476099d7ace84a0849':
| * | | | am 917b21a7: am 5105819c: am 8a20092a: am 545bdca4: Remove unused #include.Elliott Hughes2015-03-260-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '917b21a7b0472d471d29c3f6c9a5b94f2ad2dbc7':
| | * | | am 5105819c: am 8a20092a: am 545bdca4: Remove unused #include.Elliott Hughes2015-03-260-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | * commit '5105819cc3cada594aa3417a68abbe93b432b99b':
* | | | | | am 7dbcac71: am 4a422699: am 247b3245: am 1772218b: am 3afe9ae1: Fix ↵Elliott Hughes2015-03-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implicit declaration of function \'prctl\' in clatd. * commit '7dbcac716d347262298336f91fcac60abf0caa71':
| * | | | | am 4a422699: am 247b3245: am 1772218b: am 3afe9ae1: Fix implicit declaration ↵Elliott Hughes2015-03-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of function \'prctl\' in clatd. * commit '4a4226997f70e92a0d6536d02655b57f381ae626':
| | * | | | am 247b3245: am 1772218b: am 3afe9ae1: Fix implicit declaration of function ↵Elliott Hughes2015-03-260-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'prctl\' in clatd. * commit '247b3245cb476ae7bb63532d6d55634dcaa707ad':
* | | | | | | am 96928e59: am 03832b98: am 6a92f66b: am 74aa4595: am 18921713: Remove ↵Elliott Hughes2015-03-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unused #include. * commit '96928e59ae4f88d716a0b56d52ede69c868e0c29':
| * | | | | | am 03832b98: am 6a92f66b: am 74aa4595: am 18921713: Remove unused #include.Elliott Hughes2015-03-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '03832b9817c64856664e805a5ac8fc43da023c3d':
| | * | | | | am 6a92f66b: am 74aa4595: am 18921713: Remove unused #include.Elliott Hughes2015-03-260-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a92f66b2f33884ef78139c14b54862ba09299f1':
* | | | | | | | am 803d3ef4: am b682729e: am 09d568fd: am be066f60: am 787ea969: Fix ↵Elliott Hughes2015-03-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implicit declaration of function \'prctl\' in clatd. * commit '803d3ef41ecd1513eda51da249f59194e45e1f74':
| * | | | | | | am b682729e: am 09d568fd: am be066f60: am 787ea969: Fix implicit declaration ↵Elliott Hughes2015-03-260-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of function \'prctl\' in clatd. * commit 'b682729e7353a280c4495a8a07416073613e0a67':
| | * | | | | | am 09d568fd: am be066f60: am 787ea969: Fix implicit declaration of function ↵Elliott Hughes2015-03-260-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'prctl\' in clatd. * commit '09d568fda561d4915e9a222bea7487a5200dca69':
* | | \ \ \ \ \ \ Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into ↵Prerepa Viswanadham2015-03-240-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master_merge
| * | | | | | | | | Remove unused variables.Dan Albert2015-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b1384e78c55b7327b6a635d0a853665cbb59e8b
| * | | | | | | | | Make the raw socket and the tun fd nonblocking.Lorenzo Colitti2015-03-031-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 49454814a0a714189916cb2aea1922bc8784b13b) Change-Id: I6c0e0fba64e9a785cd225e8c543df06e864db8e7
| * | | | | | | | | Switch the receive path to memory-mapped I/O with PACKET_RX_RING.Lorenzo Colitti2015-03-035-47/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 9353be2a5f1b4fd00b04e4c826f7f3c3ec6c5d46) Change-Id: Ifb35b4efae0363a2006f3bba002e44a0560f3014
| * | | | | | | | | Add missing include for IFF_BROADCAST to fix buildAlan Viverette2015-03-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit cfbb4ac47fb065c888b63b03a5697d24c9c5952e) Change-Id: I03411d12ef4f45fe0c0c14dd6f546108e272da93
| * | | | | | | | | Add a microbenchmark for tun write performance.Lorenzo Colitti2015-03-034-4/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit b20719ebf403b16d36a231aeef96607f8c7aa252) Change-Id: Ied5c60ceaf6ae3c80a3e0ac0785581e758158d20
| * | | | | | | | | Move send_tun into tun.c as well.Lorenzo Colitti2015-03-037-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove a redundant include in checksum.c. (cherry picked from commit 6b2007aacd13344c9bc73d5d858bd903b432c228) Change-Id: I8fd33ff52375b51e5d2f15b0a206d0a2dd3ba461
| * | | | | | | | | Move tun functions to a new tun.c.Lorenzo Colitti2015-03-035-47/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit ff6f7fe4bd983c623d490100fa17cdb4936b95a2) Change-Id: I1effc2309565375bbe98262dd602a0895ab49fcf
| * | | | | | | | | Android-Clatd: Remove unused variableAndreas Gampe2015-03-031-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, fix unused-but-set variables. (cherry picked from commit fee9afb1a5d9f7f5df0c79e29368c61d7da16fb8) Change-Id: Icacc158baae40d18f56bb32bb400ae6e765b0dad
* | | | | | | | | | am 93be7592: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ↵Qiwen Zhao2015-03-220-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE ANYWHERE. * commit '93be75925f18873ba28fffd4c11a2a2004c7312d':
| * | | | | | | | | reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-200-0/+0
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | am 8dccd379: am 05ff508a: Remove unused variables.Chih-Hung Hsieh2015-03-201-2/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '8dccd3794fa07bd6ebcb9c82172860f7fd631855': Remove unused variables.
| | * | | | | | | am cca70d8b: am dce3ddf5: Call read on any event, not just on POLLIN.Lorenzo Colitti2015-03-200-0/+0
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | * commit 'cca70d8b359709a1fb6989f30f278c4a9e86deb9':
| | * | | | | | | am 8a20092a: am 545bdca4: Remove unused #include.Elliott Hughes2015-03-200-0/+0
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | * commit '8a20092a0781bab6bbe61df53c0f876655d047da':
| | * | | | | | | am 1772218b: am 3afe9ae1: Fix implicit declaration of function \'prctl\' in ↵Elliott Hughes2015-03-200-0/+0
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clatd. * commit '1772218b15121991fbe21c845be526636ea3762b':
| | * | | | | | | am 74aa4595: am 18921713: Remove unused #include.Elliott Hughes2015-03-200-0/+0
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '74aa459500f76eb3232df26ecdd6790110ade80a': Remove unused #include.
| | * | | | | | | am be066f60: am 787ea969: Fix implicit declaration of function \'prctl\' in ↵Elliott Hughes2015-03-200-0/+0
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clatd. * commit 'be066f6079f511fc76cb58e3678f7bc315d6408b': Fix implicit declaration of function 'prctl' in clatd.
* | | | | | | | | am 6ea37346: Remove unused variables.Dan Albert2015-02-201-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ea37346ad20ac623312051b293bf5656e8072f6': Remove unused variables.
| * | | | | | | | Remove unused variables.android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewmaster-soongDan Albert2015-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b1384e78c55b7327b6a635d0a853665cbb59e8b
* | | | | | | | | am 4cc75ff1: am 49454814: Make the raw socket and the tun fd nonblocking.Lorenzo Colitti2015-02-201-2/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4cc75ff1ce527949387107d9d140fb6a69e5e1f0': Make the raw socket and the tun fd nonblocking.
| * | | | | | | | am 49454814: Make the raw socket and the tun fd nonblocking.Lorenzo Colitti2015-02-201-2/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '49454814a0a714189916cb2aea1922bc8784b13b': Make the raw socket and the tun fd nonblocking.
| | * | | | | | | | Make the raw socket and the tun fd nonblocking.Lorenzo Colitti2015-02-031-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I29a3d510ba0b766488bbd66d57829d9aaf70d21d
* | | | | | | | | | am f007c63f: am 9353be2a: Switch the receive path to memory-mapped I/O with ↵Lorenzo Colitti2015-02-205-47/+219
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PACKET_RX_RING. * commit 'f007c63fd437d1bd979bbe3882948776485ef55c': Switch the receive path to memory-mapped I/O with PACKET_RX_RING.
| * | | | | | | | | am 9353be2a: Switch the receive path to memory-mapped I/O with PACKET_RX_RING.Lorenzo Colitti2015-02-205-47/+219
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9353be2a5f1b4fd00b04e4c826f7f3c3ec6c5d46': Switch the receive path to memory-mapped I/O with PACKET_RX_RING.
| | * | | | | | | | Switch the receive path to memory-mapped I/O with PACKET_RX_RING.Lorenzo Colitti2015-02-035-47/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I93231de8f108db782eaa43aceb6cc5281d3739c4
* | | | | | | | | | am 43e459a2: resolved conflicts for merge of 2008e147 to lmp-mr1-dev-plus-aospSreeram Ramachandran2014-12-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '43e459a234df420806d30bd5613464eedc25ece7': Cleanup: Remove unused "ipv6_local_address".
| * | | | | | | | | resolved conflicts for merge of 2008e147 to lmp-mr1-dev-plus-aospSreeram Ramachandran2014-12-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9e7400c62fd9cb8eec946c77ab0727e05af18638
| | * | | | | | | | Cleanup: Remove unused "ipv6_local_address".Sreeram Ramachandran2014-12-173-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was originally used on the "clat" interface. That interface is not created anymore (since the switch to using a raw socket). Note that the v6 address used on the raw socket is a combination of the plat subnet plus a host ID, and not this link-local address. Also fixup default values to match clatd.conf values. (cherry picked from commit c0a8ce0d1ddcd3196c213e6df595955835a6942e) Change-Id: I3470a02e6798b65cae0f8d7f074ce51fb0647e6a
* | | | | | | | | | am 0f0a1ebd: am b20719eb: Add a microbenchmark for tun write performance.Lorenzo Colitti2014-12-094-4/+248
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0f0a1ebdb167d31c0eef7d4a5ded3cc752c3d500': Add a microbenchmark for tun write performance.
| * | | | | | | | | am b20719eb: Add a microbenchmark for tun write performance.Lorenzo Colitti2014-12-094-4/+248
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b20719ebf403b16d36a231aeef96607f8c7aa252': Add a microbenchmark for tun write performance.
| | * | | | | | | | Add a microbenchmark for tun write performance.android-wear-5.0.0_r1lollipop-wear-releaseLorenzo Colitti2014-12-084-4/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id73888d25afd9253634356436c57afec630a0846
* | | | | | | | | | am 400153fc: resolved conflicts for merge of 6b2007aa to lmp-mr1-dev-plus-aospLorenzo Colitti2014-12-097-18/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '400153fc8d1ae20a2fabec36e3144e7623f282d4': Move send_tun into tun.c as well.