commit 461b4081296b6cd80171162327dfb4bfd02d0ade
author Maciej Żenczykowski <maze@google.com> Thu Aug 29 21:15:29 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 29 21:15:29 2024 +0000
tree 17bd9b8ab7002375855474bd4ea6f27b1efbfc79
parent dcb2e7496cd43c6e041d3a1f55b5b61405ef98fd
parent 508c8f785700adc0cf58a4ce2ee1572ccd257b7c

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

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);
         }