joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "DscpPolicy Move to kernel 5.15" am: b3ec6329e7

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2141233

Change-Id: Ide70a39a798d6f609104c305577a75f788d72105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-07-01 16:12:23 +00:00 • committed by Automerger Merge Worker
commit 7921079cf8
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bpf_progs/dscp_policy.c
View file

@ -297,7 +297,7 @@ static inline __always_inline void match_policy(struct __sk_buff* skb, bool ipv4
}
DEFINE_BPF_PROG_KVER("schedcls/set_dscp_ether", AID_ROOT, AID_SYSTEM,
schedcls_set_dscp_ether, KVER(5, 4, 0))
schedcls_set_dscp_ether, KVER(5, 15, 0))
(struct __sk_buff* skb) {
if (skb->pkt_type != PACKET_HOST) return TC_ACT_PIPE;
@ -313,7 +313,7 @@ DEFINE_BPF_PROG_KVER("schedcls/set_dscp_ether", AID_ROOT, AID_SYSTEM,
}
DEFINE_BPF_PROG_KVER("schedcls/set_dscp_raw_ip", AID_ROOT, AID_SYSTEM,
schedcls_set_dscp_raw_ip, KVER(5, 4, 0))
schedcls_set_dscp_raw_ip, KVER(5, 15, 0))
(struct __sk_buff* skb) {
if (skb->protocol == htons(ETH_P_IP)) {
match_policy(skb, true, false);

6
tests/cts/net/src/android/net/cts/DscpPolicyTest.kt
View file

@ -136,8 +136,8 @@ class DscpPolicyTest {
@Before
fun setUp() {
// For BPF support kernel needs to be at least 5.4.
assumeTrue(kernelIsAtLeast(5, 4))
// For BPF support kernel needs to be at least 5.15.
assumeTrue(kernelIsAtLeast(5, 15))
runAsShell(MANAGE_TEST_NETWORKS) {
val tnm = realContext.getSystemService(TestNetworkManager::class.java)
@ -158,7 +158,7 @@ class DscpPolicyTest {
@After
fun tearDown() {
if (!kernelIsAtLeast(5, 4)) {
if (!kernelIsAtLeast(5, 15)) {
return;
}
agentsToCleanUp.forEach { it.unregister() }