diff options
author | Yonghong Song <yhs@fb.com> | 2018-09-17 22:08:13 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-20 18:46:54 +0100 |
commit | eaa4d5ac4403fa7d59e1cb0f8b1eee7f4de51716 (patch) | |
tree | 8f6542f1cbb7cd45b6231be1f1023d3ba56ac859 /samples/bpf | |
parent | feb52253d7380f17f355a5a97205110a594844b0 (diff) | |
download | linux-stable-eaa4d5ac4403fa7d59e1cb0f8b1eee7f4de51716.tar.gz linux-stable-eaa4d5ac4403fa7d59e1cb0f8b1eee7f4de51716.tar.bz2 linux-stable-eaa4d5ac4403fa7d59e1cb0f8b1eee7f4de51716.zip |
samples/bpf: fix a compilation failure
[ Upstream commit 534e0e52bc23de588e81b5a6f75e10c8c4b189fc ]
samples/bpf build failed with the following errors:
$ make samples/bpf/
...
HOSTCC samples/bpf/sockex3_user.o
/data/users/yhs/work/net-next/samples/bpf/sockex3_user.c:16:8: error: redefinition of ‘struct bpf_flow_keys’
struct bpf_flow_keys {
^
In file included from /data/users/yhs/work/net-next/samples/bpf/sockex3_user.c:4:0:
./usr/include/linux/bpf.h:2338:9: note: originally defined here
struct bpf_flow_keys *flow_keys;
^
make[3]: *** [samples/bpf/sockex3_user.o] Error 1
Commit d58e468b1112d ("flow_dissector: implements flow dissector BPF hook")
introduced struct bpf_flow_keys in include/uapi/linux/bpf.h and hence
caused the naming conflict with samples/bpf/sockex3_user.c.
The fix is to rename struct bpf_flow_keys in samples/bpf/sockex3_user.c
to flow_keys to avoid the conflict.
Signed-off-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'samples/bpf')
-rw-r--r-- | samples/bpf/sockex3_user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samples/bpf/sockex3_user.c b/samples/bpf/sockex3_user.c index 5ba3ae9d180b..22f74d0e1493 100644 --- a/samples/bpf/sockex3_user.c +++ b/samples/bpf/sockex3_user.c @@ -13,7 +13,7 @@ #define PARSE_IP_PROG_FD (prog_fd[0]) #define PROG_ARRAY_FD (map_fd[0]) -struct bpf_flow_keys { +struct flow_keys { __be32 src; __be32 dst; union { @@ -64,7 +64,7 @@ int main(int argc, char **argv) (void) f; for (i = 0; i < 5; i++) { - struct bpf_flow_keys key = {}, next_key; + struct flow_keys key = {}, next_key; struct pair value; sleep(1); |