commit 59f2fdfd9308a56217f2e3cd5485e064b105d4d2
author Maciej Żenczykowski <maze@google.com> Mon Feb 17 18:08:49 2020 -0800
committer Maciej Żenczykowski <maze@google.com> Tue Feb 18 06:19:27 2020 +0000
tree 5b5ae863e058502c91e25c3c4bf1a0a0ff3e4e0b
parent 1da9008a49dd7acf9ab1f1a5f727ad541c487756

OffloadUtilsTest - adjust for medium age kernels

Test: build, atest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I681d5942534a43ecac0363ff3c4ed14aa1d01b6f

server/OffloadUtilsTest.cpp

diff --git a/server/OffloadUtilsTest.cpp b/server/OffloadUtilsTest.cpp
index a2c3982..d93ac1e 100644
--- a/server/OffloadUtilsTest.cpp
+++ b/server/OffloadUtilsTest.cpp
@@ -247,9 +247,12 @@
     if (!kernelSupportsNetSchIngress()) return;
     if (!kernelSupportsNetClsBpf()) return;
 
-    const bool extended = (android::bpf::getBpfSupportLevel() >= android::bpf::BpfLevel::EXTENDED);
-    // 4.9 returns EINVAL instead of ENOENT...
-    const int errNOENT = extended ? ENOENT : EINVAL;
+    const bool extended =
+            (android::bpf::getBpfSupportLevel() >= android::bpf::BpfLevel::EXTENDED_4_14);
+    // Older kernels return EINVAL instead of ENOENT due to lacking proper error propagation...
+    const int errNOENT =
+            (android::bpf::getBpfSupportLevel() >= android::bpf::BpfLevel::EXTENDED_5_4) ? ENOENT
+                                                                                         : EINVAL;
 
     int clatBpfFd = ingress ? getClatIngressProgFd(ethernet) : getClatEgressProgFd(ethernet);
     ASSERT_LE(3, clatBpfFd);