commit f8dbbdcb69f06b7c7b6c0590976b3693d82b43a1
author Tyler Wear <quic_twear@quicinc.com> Wed Jun 29 12:45:20 2022 -0700
committer Remi NGUYEN VAN <reminv@google.com> Fri Sep 02 18:03:31 2022 +0900
tree 2d1bae041763795799c85e332b3d975557936288
parent b9614c3818bea8d06d0270996f6bba02cfe9c850

DscpPolicy Move to kernel 5.15

Require at least kernel 5.15. Feature is not required on older
kernels and may impact boot time unnecessarily.

Bug: 235559605
BUg: 241077401
Fixes: 241077401
Test: run cts -m CtsNetTestCases -t android.net.cts.DscpPolicyTest
Change-Id: I2e4b509de1d8940fc63ae057a8326f13c0fd1420
Merged-In: I2e4b509de1d8940fc63ae057a8326f13c0fd1420

tests/cts/net/src/android/net/cts/DscpPolicyTest.kt

diff --git a/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt b/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt
index bbac09b..621b743 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 @@
 
     @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 @@
 
     @After
     fun tearDown() {
-        if (!kernelIsAtLeast(5, 4)) {
+        if (!kernelIsAtLeast(5, 15)) {
             return;
         }
         agentsToCleanUp.forEach { it.unregister() }