commit 4e4f8720f26e930dfe1e34fb6170eccb796e1d98
author Maciej Żenczykowski <maze@google.com> Sat Jun 15 06:38:08 2024 -0700
committer Maciej Żenczykowski <maze@google.com> Fri Jun 21 15:47:00 2024 +0000
tree 23e4639060cc71e52ee8f6a6c62088d1429ab529
parent 2afffc2d6acf2d1322a09b71d03d9054d289c057

Revert "NetBpfLoad: disable mainline on < U QPR3"

This reverts commit 4b28336a7a35df561511b2124bca1a817daa9426.

Fixed trivial comment conflicts in netd/BpfHandler.cpp

This is targetting mainline release M-2024-09.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I048af33789590dda4e1f0be0660419ca6b3ad57f

bpf_progs/dscpPolicy.c

diff --git a/bpf_progs/dscpPolicy.c b/bpf_progs/dscpPolicy.c
index 1739c37..ed114e4 100644
--- a/bpf_progs/dscpPolicy.c
+++ b/bpf_progs/dscpPolicy.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 // The resulting .o needs to load on Android T+
-#define BPFLOADER_MIN_VER BPFLOADER_T_VERSION
+#define BPFLOADER_MIN_VER BPFLOADER_MAINLINE_T_VERSION
 
 #include "bpf_helpers.h"
 #include "dscpPolicy.h"