]> git.baikalelectronics.ru Git - kernel.git/commit
samples/bpf: fix compilation failure
authorPrashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
Thu, 20 Sep 2018 07:52:03 +0000 (16:52 +0900)
committerDaniel Borkmann <daniel@iogearbox.net>
Fri, 21 Sep 2018 20:51:16 +0000 (22:51 +0200)
commitb80a08b5e1e26750c3ec6a2cdc67fda531cb9821
tree83b008305d7956948841b8acee1655a156a308b3
parent99656487840a9143d85eada7cccc4fda9c6b6f31
samples/bpf: fix compilation failure

following commit:
commit c8f075ad441f ("flow_dissector: implements flow dissector BPF hook")
added struct bpf_flow_keys which conflicts with the struct with
same name in sockex2_kern.c and sockex3_kern.c

similar to commit:
commit 4bf68f3f468f ("samples/bpf: fix a compilation failure")
we tried the rename it "flow_keys" but it also conflicted with struct
having same name in include/net/flow_dissector.h. Hence renaming the
struct to "flow_key_record". Also, this commit doesn't fix the
compilation error completely because the similar struct is present in
sockex3_kern.c. Hence renaming it in both files sockex3_user.c and
sockex3_kern.c

Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
samples/bpf/sockex2_kern.c
samples/bpf/sockex3_kern.c
samples/bpf/sockex3_user.c