diff options
| author | Maciej Żenczykowski <maze@google.com> | 2022-05-24 15:56:03 -0700 |
|---|---|---|
| committer | Maciej Żenczykowski <maze@google.com> | 2022-06-21 03:17:55 +0000 |
| commit | b6efc7f168518a8bbf3daa2ac517c0e722e1cfde (patch) | |
| tree | 18487d713d24a4a255d93299cf7bb2fdf44fb9cf | |
| parent | 99f342e229d006c5d0d7ba93449780243e386fe7 (diff) | |
| download | Connectivity-b6efc7f168518a8bbf3daa2ac517c0e722e1cfde.tar.gz | |
bpf programs: switch from integers to #define'd bpfloader versions
(per request from Lorenzo)
We do bump block/clatd/dscp_policy requirements from 0.12 to 0.13,
but this effectively doesn't matter:
- Beta2 is too old either way (pre-0.12)
- Beta3 is new enough (0.13)
- versions in between are simply obsolete / unused / not important
- bpfloader 0.12 won't boot right anyway due to lack of netd maps/programs
(which cause a netd startup failure)
This allows us to have one less #define in the header files,
with a hard to write explanation about what exactly v0.12 is (or was).
Bug: 218408035
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I1ecf15f9d7abbb82ec6bd49848255fab6a41aed4
(cherry picked from commit f769952212aa081c9f9c77cb264dedaeefd5bcda)
Merged-In: I1ecf15f9d7abbb82ec6bd49848255fab6a41aed4
| -rw-r--r-- | bpf_progs/block.c | 4 | ||||
| -rw-r--r-- | bpf_progs/clatd.c | 4 | ||||
| -rw-r--r-- | bpf_progs/dscp_policy.c | 4 | ||||
| -rw-r--r-- | bpf_progs/netd.c | 4 | ||||
| -rw-r--r-- | bpf_progs/offload.c | 4 | ||||
| -rw-r--r-- | bpf_progs/test.c | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/bpf_progs/block.c b/bpf_progs/block.c index 601b93281e..f2a3e62a05 100644 --- a/bpf_progs/block.c +++ b/bpf_progs/block.c @@ -19,8 +19,8 @@ #include <netinet/in.h> #include <stdint.h> -// The resulting .o needs to load on the Android T bpfloader v0.12+ -#define BPFLOADER_MIN_VER 12u +// The resulting .o needs to load on the Android T beta 3 bpfloader +#define BPFLOADER_MIN_VER BPFLOADER_T_BETA3_VERSION #include "bpf_helpers.h" diff --git a/bpf_progs/clatd.c b/bpf_progs/clatd.c index 87795f58ad..c5b855510f 100644 --- a/bpf_progs/clatd.c +++ b/bpf_progs/clatd.c @@ -30,8 +30,8 @@ #define __kernel_udphdr udphdr #include <linux/udp.h> -// The resulting .o needs to load on the Android T bpfloader v0.12+ -#define BPFLOADER_MIN_VER 12u +// The resulting .o needs to load on the Android T beta 3 bpfloader +#define BPFLOADER_MIN_VER BPFLOADER_T_BETA3_VERSION #include "bpf_helpers.h" #include "bpf_net_helpers.h" diff --git a/bpf_progs/dscp_policy.c b/bpf_progs/dscp_policy.c index 7211f2b866..538a9e4e6a 100644 --- a/bpf_progs/dscp_policy.c +++ b/bpf_progs/dscp_policy.c @@ -27,8 +27,8 @@ #include <netinet/udp.h> #include <string.h> -// The resulting .o needs to load on the Android T bpfloader v0.12+ -#define BPFLOADER_MIN_VER 12u +// The resulting .o needs to load on the Android T beta 3 bpfloader +#define BPFLOADER_MIN_VER BPFLOADER_T_BETA3_VERSION #include "bpf_helpers.h" #include "dscp_policy.h" diff --git a/bpf_progs/netd.c b/bpf_progs/netd.c index e0d67e914a..92722311ea 100644 --- a/bpf_progs/netd.c +++ b/bpf_progs/netd.c @@ -14,8 +14,8 @@ * limitations under the License. */ -// The resulting .o needs to load on the Android T Beta 3 bpfloader v0.13+ -#define BPFLOADER_MIN_VER 13u +// The resulting .o needs to load on the Android T Beta 3 bpfloader +#define BPFLOADER_MIN_VER BPFLOADER_T_BETA3_VERSION #include <bpf_helpers.h> #include <linux/bpf.h> diff --git a/bpf_progs/offload.c b/bpf_progs/offload.c index 896bc09a32..2ec0792172 100644 --- a/bpf_progs/offload.c +++ b/bpf_progs/offload.c @@ -24,8 +24,8 @@ #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 +// The resulting .o needs to load on the Android S bpfloader +#define BPFLOADER_MIN_VER BPFLOADER_S_VERSION #include "bpf_helpers.h" #include "bpf_net_helpers.h" diff --git a/bpf_progs/test.c b/bpf_progs/test.c index c9c73f15c9..f2fcc8c86f 100644 --- a/bpf_progs/test.c +++ b/bpf_progs/test.c @@ -18,8 +18,8 @@ #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 +// The resulting .o needs to load on the Android S bpfloader +#define BPFLOADER_MIN_VER BPFLOADER_S_VERSION #include "bpf_helpers.h" #include "bpf_net_helpers.h" |