| commit | 5c87eab8e39612c09b28075b965c72289a841efc | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Thu Nov 18 05:18:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 18 05:18:02 2021 +0000 |
| tree | e74c722626da784ee86fdc2828fca7ca27db30b4 | |
| parent | 4e3fc8468b04ca5016c5ba8b86479c9ce871c5b4 [diff] | |
| parent | a457bf7ea84e759e53376260cab056eb8b963c9c [diff] |
explicitly specify that offload.o & test.o bpf programs are S+ am: a457bf7ea8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895606 Change-Id: I395be59bdd4451e1295e9beff8923ffb0d6c9da9
diff --git a/Tethering/bpf_progs/offload.c b/Tethering/bpf_progs/offload.c index 51fed76..977e918 100644 --- a/Tethering/bpf_progs/offload.c +++ b/Tethering/bpf_progs/offload.c
@@ -24,6 +24,9 @@ #define __kernel_udphdr udphdr #include <linux/udp.h> +// The resulting .o needs to load on the Android S bpfloader v0.2 +#define BPFLOADER_MIN_VER 2u + #include "bpf_helpers.h" #include "bpf_net_helpers.h" #include "bpf_tethering.h"
diff --git a/Tethering/bpf_progs/test.c b/Tethering/bpf_progs/test.c index 3f0df2e..a76e346 100644 --- a/Tethering/bpf_progs/test.c +++ b/Tethering/bpf_progs/test.c
@@ -18,6 +18,9 @@ #include <linux/in.h> #include <linux/ip.h> +// The resulting .o needs to load on the Android S bpfloader v0.2 +#define BPFLOADER_MIN_VER 2u + #include "bpf_helpers.h" #include "bpf_net_helpers.h" #include "bpf_tethering.h"