commit 4290adef1c3bb0879e917bbcfc5351b7b1f1ced3
author Maciej Żenczykowski <maze@google.com> Thu Aug 29 21:18:27 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 29 21:18:27 2024 +0000
tree e55b75c6461dd98637b83aa556a279660d16e64b
parent 856f404b71a49fa9dbb8c7ab973c6d4dd2248dc9
parent 461b4081296b6cd80171162327dfb4bfd02d0ade

Merge "NetBpfLoad: do not log bpfGetFdMapId() failures on 4.9" into main am: 461b408129

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

Change-Id: Ie099a590ea5d75ec8128e33975c92ff4b6e55170
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bpf/loader/NetBpfLoad.cpp

diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp
index 32b506d..55e41d3 100644
--- a/bpf/loader/NetBpfLoad.cpp
+++ b/bpf/loader/NetBpfLoad.cpp
@@ -842,7 +842,8 @@
 
         int mapId = bpfGetFdMapId(fd);
         if (mapId == -1) {
-            ALOGE("bpfGetFdMapId failed, ret: %d [%d]", mapId, errno);
+            if (isAtLeastKernelVersion(4, 14, 0))
+                ALOGE("bpfGetFdMapId failed, ret: %d [%d]", mapId, errno);
         } else {
             ALOGI("map %s id %d", mapPinLoc.c_str(), mapId);
         }