From a627d77127895ccdef0db025e45992b0eb004e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 15 Apr 2025 13:48:19 -0700 Subject: [PATCH] NetBpfLoad: remove dead code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This code requires !isArm() isUserspace32bit() isAtLeastKernelVersion(6, 7, 0) which implies isAtLeastKernelVersion(6, 2, 0) meaning we match the condition in 1801, and don't match the isArm() conditions in 1803/1806/1810, thus we'd have already 'returned 1' in line 1815. Test: TreeHugger Flag: EXEMPT mainline Signed-off-by: Maciej Żenczykowski Change-Id: I234ba91b9bdbfeaf1077eac64248d3ebfe2f2cd2 --- bpf/loader/NetBpfLoad.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp index 2d8f783365..71d85db0ab 100644 --- a/bpf/loader/NetBpfLoad.cpp +++ b/bpf/loader/NetBpfLoad.cpp @@ -1816,12 +1816,6 @@ static int doLoad(char** argv, char * const envp[]) { } } - // On handheld, 6.6 is highest version supported by Android V (sdk=35), so this is for sdk=36+ - if (!isArm() && isUserspace32bit() && isAtLeastKernelVersion(6, 7, 0)) { - ALOGE("64-bit userspace required on 6.7+ kernels."); - return 1; - } - if (isAtLeast25Q2) { FILE * f = fopen("/system/etc/init/netbpfload.rc", "re"); if (!f) {