summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorYonghong Song <yhs@fb.com>2018-09-17 22:08:13 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-20 18:00:07 +0100
commit45503ce9086cabc9b3faaaed4563b2da8af1ffe2 (patch)
tree31db368b4e3875a3fff2f0f75f25d10721892b31 /scripts
parent73e22730e13e8df275423ff519e19508ea80e19d (diff)
downloadlinux-stable-45503ce9086cabc9b3faaaed4563b2da8af1ffe2.tar.gz
linux-stable-45503ce9086cabc9b3faaaed4563b2da8af1ffe2.tar.bz2
linux-stable-45503ce9086cabc9b3faaaed4563b2da8af1ffe2.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 'scripts')
0 files changed, 0 insertions, 0 deletions