summaryrefslogtreecommitdiffstats
path: root/include/linux/skbuff.h
diff options
context:
space:
mode:
authorYonghong Song2018-09-18 07:08:13 +0200
committerDaniel Borkmann2018-09-18 17:50:02 +0200
commit534e0e52bc23de588e81b5a6f75e10c8c4b189fc (patch)
treee709fd48192d0af107dc4a477e9fc3e963728877 /include/linux/skbuff.h
parentsamples/bpf: remove duplicated includes (diff)
downloadkernel-qcow2-linux-534e0e52bc23de588e81b5a6f75e10c8c4b189fc.tar.gz
kernel-qcow2-linux-534e0e52bc23de588e81b5a6f75e10c8c4b189fc.tar.xz
kernel-qcow2-linux-534e0e52bc23de588e81b5a6f75e10c8c4b189fc.zip
samples/bpf: fix a compilation failure
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>
Diffstat (limited to 'include/linux/skbuff.h')
0 files changed, 0 insertions, 0 deletions