diff options
| author | Naveen N. Rao | 2016-09-23 22:40:04 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-09-27 09:48:58 +0200 |
| commit | 2b064fff8527a1052c7060c65c22cae80a9343b9 (patch) | |
| tree | 9a74e3c8cc605514c03b5637ca7cd60e38f6f4a2 /samples/bpf/sockex3_user.c | |
| parent | net: tg3: use new api ethtool_{get|set}_link_ksettings (diff) | |
| download | kernel-qcow2-linux-2b064fff8527a1052c7060c65c22cae80a9343b9.tar.gz kernel-qcow2-linux-2b064fff8527a1052c7060c65c22cae80a9343b9.tar.xz kernel-qcow2-linux-2b064fff8527a1052c7060c65c22cae80a9343b9.zip | |
bpf samples: fix compiler errors with sockex2 and sockex3
These samples fail to compile as 'struct flow_keys' conflicts with
definition in net/flow_dissector.h. Fix the same by renaming the
structure used in the sample.
Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'samples/bpf/sockex3_user.c')
| -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 d4184ab5f3ac..3fcfd8c4b2a3 100644 --- a/samples/bpf/sockex3_user.c +++ b/samples/bpf/sockex3_user.c @@ -7,7 +7,7 @@ #include <arpa/inet.h> #include <sys/resource.h> -struct flow_keys { +struct bpf_flow_keys { __be32 src; __be32 dst; union { @@ -49,7 +49,7 @@ int main(int argc, char **argv) (void) f; for (i = 0; i < 5; i++) { - struct flow_keys key = {}, next_key; + struct bpf_flow_keys key = {}, next_key; struct pair value; sleep(1); |