58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
From ac8f163e0b2e14afdc8a1a1d449f1e5db07075ba Mon Sep 17 00:00:00 2001
|
||
From: Andrea Claudi <aclaudi@redhat.com>
|
||
Date: Thu, 13 Jun 2019 14:37:57 +0200
|
||
Subject: [PATCH] lib/bpf: fix build warning if no elf
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1716361
|
||
Upstream Status: iproute2.git commit 33fde2b60081e
|
||
|
||
commit 33fde2b60081ed9ac16f7dd81c48233803855689
|
||
Author: Stephen Hemminger <stephen@networkplumber.org>
|
||
Date: Mon Dec 10 13:50:17 2018 -0800
|
||
|
||
lib/bpf: fix build warning if no elf
|
||
|
||
Function was not used unlesss HAVE_ELF causing:
|
||
|
||
bpf.c:105:13: warning: ‘bpf_map_offload_neutral’ defined but not used [-Wunused-function]
|
||
|
||
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
||
---
|
||
lib/bpf.c | 10 +++++-----
|
||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||
|
||
diff --git a/lib/bpf.c b/lib/bpf.c
|
||
index 6aff8f7bad7fb..5e85cfc0bdd5b 100644
|
||
--- a/lib/bpf.c
|
||
+++ b/lib/bpf.c
|
||
@@ -102,11 +102,6 @@ static const struct bpf_prog_meta __bpf_prog_meta[] = {
|
||
},
|
||
};
|
||
|
||
-static bool bpf_map_offload_neutral(enum bpf_map_type type)
|
||
-{
|
||
- return type == BPF_MAP_TYPE_PERF_EVENT_ARRAY;
|
||
-}
|
||
-
|
||
static const char *bpf_prog_to_subdir(enum bpf_prog_type type)
|
||
{
|
||
assert(type < ARRAY_SIZE(__bpf_prog_meta) &&
|
||
@@ -1610,6 +1605,11 @@ static bool bpf_is_map_in_map_type(const struct bpf_elf_map *map)
|
||
map->type == BPF_MAP_TYPE_HASH_OF_MAPS;
|
||
}
|
||
|
||
+static bool bpf_map_offload_neutral(enum bpf_map_type type)
|
||
+{
|
||
+ return type == BPF_MAP_TYPE_PERF_EVENT_ARRAY;
|
||
+}
|
||
+
|
||
static int bpf_map_attach(const char *name, struct bpf_elf_ctx *ctx,
|
||
const struct bpf_elf_map *map, struct bpf_map_ext *ext,
|
||
int *have_map_in_map)
|
||
--
|
||
2.20.1
|
||
|