diff options
| author | Michael Forney <mforney@mforney.org> | 2020-06-16 13:40:55 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2020-06-16 13:40:55 -0700 |
| commit | f2238aeacecc0521b3b92c46053232996f5f28f1 (patch) | |
| tree | 743c22111cbc76986f029c802b8b510563423b9a /pkg | |
| parent | 8ee6867a9779d5484f9ff7b8f4811a70d40f5ebf (diff) | |
iproute2: Add patch from linux-headers to fix non-portable enum constants
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/iproute2/patch/0015-Revert-change-of-BPF_F_-to-enum-constants.patch | 32 | ||||
| -rw-r--r-- | pkg/iproute2/ver | 2 |
2 files changed, 33 insertions, 1 deletions
diff --git a/pkg/iproute2/patch/0015-Revert-change-of-BPF_F_-to-enum-constants.patch b/pkg/iproute2/patch/0015-Revert-change-of-BPF_F_-to-enum-constants.patch new file mode 100644 index 00000000..102c9650 --- /dev/null +++ b/pkg/iproute2/patch/0015-Revert-change-of-BPF_F_-to-enum-constants.patch @@ -0,0 +1,32 @@ +From 3a8909b55ed2e7ee7d3453ba4ca7dbaf5052febc Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Tue, 2 Jun 2020 03:56:03 -0700 +Subject: [PATCH] Revert change of BPF_F_* to enum constants + +--- + include/uapi/linux/bpf.h | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h +index bc84f10a..ad775f66 100644 +--- a/include/uapi/linux/bpf.h ++++ b/include/uapi/linux/bpf.h +@@ -3216,12 +3216,10 @@ enum { + /* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and + * BPF_FUNC_perf_event_read_value flags. + */ +-enum { +- BPF_F_INDEX_MASK = 0xffffffffULL, +- BPF_F_CURRENT_CPU = BPF_F_INDEX_MASK, ++#define BPF_F_INDEX_MASK 0xffffffffULL ++#define BPF_F_CURRENT_CPU BPF_F_INDEX_MASK + /* BPF_FUNC_perf_event_output for sk_buff input context. */ +- BPF_F_CTXLEN_MASK = (0xfffffULL << 32), +-}; ++#define BPF_F_CTXLEN_MASK (0xfffffULL << 32) + + /* Current network namespace */ + enum { +-- +2.27.0 + diff --git a/pkg/iproute2/ver b/pkg/iproute2/ver index 78623ae3..b040e275 100644 --- a/pkg/iproute2/ver +++ b/pkg/iproute2/ver @@ -1 +1 @@ -5.7.0 r1 +5.7.0 r2 |