aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add METADATA to iproute2: GPL=RESTRICTED" am: 7c3c47da47 am: d6e38af5a7HEADmasterMaciej Żenczykowski2020-04-301-0/+3
|\ | | | | | | Change-Id: Ib353c85e5139e9cfc9b47a202529a6d376c473d3
| * Merge "Add METADATA to iproute2: GPL=RESTRICTED" am: 7c3c47da47Maciej Żenczykowski2020-04-301-0/+3
| |\ | | | | | | | | | Change-Id: I339ea8420e6977383776b7f2c6df493d00220e05
| | * Merge "Add METADATA to iproute2: GPL=RESTRICTED"Maciej Żenczykowski2020-04-301-0/+3
| | |\
| | | * Add METADATA to iproute2: GPL=RESTRICTEDBob Badour2020-04-281-0/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ifac1327a66fd83a3ba3242755ef583f0a90b2906
* | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 0c99e26e4d -s ours am skip reason: subject contains skip directive Change-Id: Iec264fe732a5028e4ed54d5fe9e3850a109b0f56
| * | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
| |\ \ | | | | | | | | | | | | | | | | Bug: 151763422 Change-Id: Iae65c0de202a7794a78400e4e6409fb30469cc80
| | * \ DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li2020-03-190-0/+0
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | stag-aosp-master am: ce804106b6 Change-Id: I5ac9d9fb8dd16b4db0659fceb350f4af3d3fb686
* | | | [automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li2020-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: ce804106b6 -s ours am skip reason: subject contains skip directive Change-Id: I9f9fe4984e1d19b6360205dd92383f4b9215bee9
| * | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li2020-03-180-0/+0
| |\| | | | |/ | |/| | | | | | | Bug: 151763422 Change-Id: Iadec0d4e064098802cd0ca0f9002e3af58e18a0b
* | | Merge "ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernel" am: 68454405a4 am: ↵android-mainline-11.0.0_r1android11-mainline-releaseandroid11-devAutomerger Merge Worker2020-01-243-2/+24
|\ \ \ | | |/ | |/| | | | | | | | | | cd4884e9d6 am: a49f6aaa53 Change-Id: Ifde7908cd3e411a3ba7d46ab24a8c75adbceecfe
| * | Merge "ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernel" am: 68454405a4 am: ↵Automerger Merge Worker2020-01-243-2/+24
| |\| | | | | | | | | | | | | | | | cd4884e9d6 Change-Id: I22e6aae3e0f86306dbda890b893ef240867b1da3
| | * Merge "ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernel" am: 68454405a4Automerger Merge Worker2020-01-243-2/+24
| |/| | | | | | | | | | Change-Id: I69618b3962cb149d14724d0ef07035bd2f563734
| | * Merge "ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernel"Maciej Żenczykowski2020-01-243-2/+24
| |/|
| | * ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernelAlistair Delva2020-01-213-2/+24
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix VtsKernelNetTest / xfrm_test.XfrmFunctionalTest testAddSa and other system users of iproute2 binaries on 32-bit x86 userspaces. The upstream XFRM netlink interface does not use packed structures, so it depends on architecture-specific alignment of XFRM structures. In upstream kernels, the workaround was to disallow 32-bit applications to use this netlink interface on 64-bit kernels, but on Android we want to support this, and so the check was removed from the kernel. Other changes had already been made to netd and various C++ unittests to mitigate this incompatibility, however these workarounds were not applied / cannot work with the C binaries from the iproute2 package. Apply the same workaround again here. NOTE: This explicitly breaks running iproute2 on a 32-bit x86 kernel. However, we don't think this will affect any device in the Android ecosystem. Bug: 138147164 Change-Id: Ibc6aa966f7f114d75c46078e5675ba2a44836a7d
* | Merge "Attempt to run netd tests when iproute2 is modified." am: de0e714027 ↵Lorenzo Colitti2019-06-131-0/+10
|\| | | | | | | | | | | | | | | am: 8d9535a6c5 am: 5765a40a00 am: ab7379dd97 Change-Id: Iaa9c8aa8e4c21bf333e155e8138b643b87d048ee
| * Merge "Attempt to run netd tests when iproute2 is modified." am: de0e714027 ↵android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-releaseLorenzo Colitti2019-06-131-0/+10
|/| | | | | | | | | | | | | | | am: 8d9535a6c5 am: 5765a40a00 Change-Id: I2da2f17835638b0f8ffb13d74e100c52640e16a3
| * Merge "Attempt to run netd tests when iproute2 is modified." am: de0e714027ndk-sysroot-r21Lorenzo Colitti2019-06-131-0/+10
|/| | | | | | | | | | | am: 8d9535a6c5 Change-Id: I6145ca12d4f079cad408211c795380677470c8b3
| * Merge "Attempt to run netd tests when iproute2 is modified."Lorenzo Colitti2019-06-131-0/+10
| |\ | | | | | | | | | | | | | | | am: de0e714027 Change-Id: I33cbef3948ef536d4847d78ed76dbce5a0a7209f
| | * Merge "Attempt to run netd tests when iproute2 is modified."Treehugger Robot2019-06-141-0/+10
| |/|
| | * Attempt to run netd tests when iproute2 is modified.Lorenzo Colitti2019-06-131-0/+10
| |/ | | | | | | | | | | Bug: 134441670 Test: treehugger Change-Id: I7c8b64c36531f6eda46ef97820cc0416d7d8bd76
* | Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li2019-02-250-0/+0
|\ \ | | | | | | | | | | | | | | | am: 9c7e0abee3 Change-Id: I33c1d0b2a151119bd3f4e0eaae4b38fcaaa2fcaa
| * | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\| | | | | | | | | | | | | Bug: 126125118 Change-Id: I09d14fc2a01c08a9fd10e6030fd8720b20e34014
| | * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: Ia237183637cd6ba3d1da2954ac1bb8c195105b13
* | | | Merge "iproute2: remove ek, add satk to OWNERS" am: f3a8012094 am: eecc645a30Maciej Żenczykowski2019-01-281-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | am: 715492c6fb Change-Id: I87614aada42ab4891b4c39941f1f2168fd8c2682
| * | | Merge "iproute2: remove ek, add satk to OWNERS" am: f3a8012094Maciej Żenczykowski2019-01-281-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | am: eecc645a30 Change-Id: I0019d58b46a7f28c4d63d70b8d933a6f94ffc0c5
| | * | Merge "iproute2: remove ek, add satk to OWNERS"Maciej Żenczykowski2019-01-281-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: f3a8012094 Change-Id: I1caf7e1ca24f3439613c7938d17cbed78989d4b6
| | | * \ Merge "iproute2: remove ek, add satk to OWNERS"Treehugger Robot2019-01-281-1/+1
| | | |\ \
| | | | * | iproute2: remove ek, add satk to OWNERSMaciej Żenczykowski2019-01-281-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I22f83786212e43961d35ee7cebaaa93fdd4c76b8
* | | | | Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686 am: ↵Maciej Żenczykowski2019-01-2814-106/+4302
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90a033c688 am: d44aa8b9cc am: ea4d1ebf3c Change-Id: I2bf3af4100f3db950567f8f8d50925fbf2402a02
| * | | | Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686 am: 90a033c688Maciej Żenczykowski2019-01-2814-106/+4302
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d44aa8b9cc Change-Id: I2e1420e1d966413a10cac0aaa347e816a98a2b40
| | * | | Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686Maciej Żenczykowski2019-01-2814-106/+4302
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 90a033c688 Change-Id: I566d008bb849f4b72031ae1f845ba624298a41f0
| | | * | Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686Maciej Żenczykowski2019-01-2814-106/+4302
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: iproute2: static compile. iproute2: support more qdiscs iproute2: support filters besides u32 iproute2: support actions besides mirred iproute2: re-enable batching
| | | | * | iproute2: static compile.Maciej Żenczykowski2019-01-2511-48/+4302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we've reverted most ANDROID specific patches, we need to actually make it build correctly. This switches on NO_SHARED_LIBS (due to issues with dlopen/dlsym) and enables tons of things, plus it mostly sorts the build files - they can't be fully sorted because link order affects symbol resolution. Things that still aren't enabled in ip/Android.bp: iplink_bond.c iplink_bond_slave.c rtmon.c (bonding due to use of 'strdupa' stack string allocation, and rtmon is an entirely separate binary) Things that still aren't enabled in tc/Android.bp: m_ipt.c m_nat.c m_xt.c m_xt_old.c q_atm.c (various compile problems, missing headers, etc) We also check in {ip/tc}/static-syms.h built via: rm -f {ip,tc}/static-syms.h touch config.mk SHARED_LIBS=n make -C ip static-syms.h SHARED_LIBS=n make -C tc static-syms.h rm -f config.mk and check-in yacc/lex output built via: rm -f tc/emp_ematch.yacc.output tc/emp_ematch.yacc.h tc/emp_ematch.yacc.c tc/emp_ematch.lex.c touch config.mk YACCFLAGS='-d -t -v' make -C tc emp_ematch.{yacc,lex}.c rm -f config.mk which require bison/flex. Furthermore we update .gitignore files to allow submitting these build outputs. Longer term we should probably make it actually generate these during the build. Only files which were manually edited were the three Android.bp files and two .gitignore files. The other six are autogenerated (see above). Note: this exposes incompatible with userspace api kernel change: commit abb705d4ef835b637e0213f34a6fe991f8c273db 'net_sched: Add flow control support to prio qdisc' which includes: struct tc_prio_qopt { int bands; /* Number of bands */ __u8 priomap[TC_PRIO_MAX+1]; /* Map: logical priority -> PRIO band */ + __u8 enable_flow; /* Enable dequeue */ }; and results in: !!!Deficit -4, rta_len=48 (if enable_flow == 0) !!!Deficit -3, rta_len=48 (if enable_flow == 1) Bug: 65674744 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I0af6a8c1f8aede2e999a41a48038cb4e167d481c
| | | | * | iproute2: support more qdiscsMaciej Żenczykowski2019-01-251-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (probably not useful without rest of patch series) Bug: 65674744 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ia77fd91eeac800429830e21bb1b368cda329a51f
| | | | * | iproute2: support filters besides u32Maciej Żenczykowski2019-01-251-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (probably not useful without rest of patch series) Bug: 65674744 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ib26b31675197c7faf459cc7b9d93b5dd6ce8e596
| | | | * | iproute2: support actions besides mirredMaciej Żenczykowski2019-01-251-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (probably not useful without rest of patch series) Bug: 65674744 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ic6e7afd98b0980db87d7eb2b33ce08d720cfbf1c
| | | | * | iproute2: re-enable batchingMaciej Żenczykowski2019-01-252-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (probably not useful without rest of patch series) Bug: 65674744 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I58752686f3e1583960e842aa7e3ae66b2446f97b
* | | | | | Merge "iproute2: add maze to OWNERS" am: bfde7e0d24 am: 1316271023Maciej Żenczykowski2019-01-281-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9edf224c24 Change-Id: I808f9078ad9876519e44688098e62eb3f70a325b
| * | | | | Merge "iproute2: add maze to OWNERS" am: bfde7e0d24Maciej Żenczykowski2019-01-281-0/+1
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | am: 1316271023 Change-Id: I53587ec02e1385fc76fa0d7a0a07151b94cd3e82
| | * | | Merge "iproute2: add maze to OWNERS"Maciej Żenczykowski2019-01-271-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: bfde7e0d24 Change-Id: Idd122e9daaa111d583958b8975ab39c2a7981ca5
| | | * | Merge "iproute2: add maze to OWNERS"Maciej Żenczykowski2019-01-281-0/+1
| | | |\|
| | | | * iproute2: add maze to OWNERSMaciej Żenczykowski2019-01-251-0/+1
| | | |/ | | | | | | | | | | | | | | | | Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: If7feb012b83bb0fe173842753793b85d875048a5
* | | | Merge "Convert to Android.bp" am: d81c8f2604 am: 5cbed885ddDan Willemsen2018-11-1910-191/+219
|\| | | | | | | | | | | | | | | | | | | | | | | am: e67d92e26b Change-Id: Ic0bd5bde18cbacc9b9423947be158da50a7c1768
| * | | Merge "Convert to Android.bp" am: d81c8f2604Dan Willemsen2018-11-1910-191/+219
| |\| | | | | | | | | | | | | | | | | | | | | | am: 5cbed885dd Change-Id: I3e22c05a39923da8e6d5718e077327dd53a6e438
| | * | Merge "Convert to Android.bp"Dan Willemsen2018-11-1910-191/+219
| | |\| | | | | | | | | | | | | | | | | | | | | am: d81c8f2604 Change-Id: Ic7f2f82715ccfb3278c66a69fac18206eac2ac02
| | | * Merge "Convert to Android.bp"Dan Willemsen2018-11-2010-191/+219
| | | |\
| | | | * Convert to Android.bpDan Willemsen2018-11-1810-191/+219
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See build/soong/README.md for more information ss was added to PRODUCT_PACKAGES_DEBUG in base_system.mk, as module tagging is not supported in Soong. Test: cd external/iproute2; mma Change-Id: I8b44e240d998e47b8ffc60e951451d570a8ae025
* | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: f13d12fe9c -s ours am: 82b968c6d9 -s ours am: 9839be66bf -s ours Change-Id: Ide9c9a9f0bf5b6a1b0522f8277bcedc2a69e08c0
| * | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: f13d12fe9c -s ours am: 82b968c6d9 -s ours Change-Id: I1203372b613d1517a5e02f4ce6d5de85a85df2a1
| | * | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | am: f13d12fe9c -s ours Change-Id: I89e36d521fb3c4578d8b49711a6829cfe2e27f09
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-11 04:54:31 +0000