diff --git a/bpf_progs/dscp_policy.c b/bpf_progs/dscp_policy.c index 538a9e4e6a..38e1050344 100644 --- a/bpf_progs/dscp_policy.c +++ b/bpf_progs/dscp_policy.c @@ -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); diff --git a/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt b/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt index bbac09bb44..621b7437b3 100644 --- a/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt +++ b/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt @@ -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() }