joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

NetBpfLoad: remove dead code

Browse source 
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 <maze@google.com>
Change-Id: I234ba91b9bdbfeaf1077eac64248d3ebfe2f2cd2
This commit is contained in:
Maciej Żenczykowski 2025-04-15 13:48:19 -07:00
commit a627d77127
1 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bpf/loader/NetBpfLoad.cpp
View file

@ -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) {