| commit | 9b64ea30aa026be84aefa60557c5d4b364c3329f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Jun 28 06:50:35 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 28 06:50:35 2024 +0000 |
| tree | 129ef6bfb22fc59588203e1af1ad72d790c9ebc4 | |
| parent | 0f930dc12c654ca31df775179753dca6cd2b235c [diff] | |
| parent | f2315d018bb5e8c9eda385b1fbd91d49fadc34e7 [diff] |
Merge "Do not run mapLockTest on 4.9 kernels" into main am: f2315d018b Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3151359 Change-Id: I75f465e4d123912b16fa22d5e5e2664255abe7f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/netd/BpfHandler.cpp b/netd/BpfHandler.cpp index 4779b47..9682545 100644 --- a/netd/BpfHandler.cpp +++ b/netd/BpfHandler.cpp
@@ -260,7 +260,10 @@ } Status BpfHandler::initMaps() { - mapLockTest(); + // bpfLock() requires bpfGetFdMapId which is only available on 4.14+ kernels. + if (bpf::isAtLeastKernelVersion(4, 14, 0)) { + mapLockTest(); + } RETURN_IF_NOT_OK(mStatsMapA.init(STATS_MAP_A_PATH)); RETURN_IF_NOT_OK(mStatsMapB.init(STATS_MAP_B_PATH));