diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-12-27 21:49:17 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-12-27 21:49:17 -0300 |
commit | ee12996c9d392ec61241ab6c74d257bc2122e0bc (patch) | |
tree | ff9548654b82dadabfb1d3aa03d111c6fe9a385b | |
parent | 9396c9cb0d9534ca67bda8a34b2413a2ca1c67e9 (diff) | |
download | op-kernel-dev-ee12996c9d392ec61241ab6c74d257bc2122e0bc.zip op-kernel-dev-ee12996c9d392ec61241ab6c74d257bc2122e0bc.tar.gz |
samples/bpf sock_example: Avoid getting ethhdr from two includes
To avoid the following build failure on Alpine Linux 3.4, that has
clang-3.8 with the bpf target:
HOSTCC samples/bpf/sock_example.o
In file included from /usr/include/net/ethernet.h:10:0,
from /git/linux/samples/bpf/sock_example.h:7,
from /git/linux/samples/bpf/sock_example.c:30:
/usr/include/netinet/if_ether.h:96:8: error: redefinition of 'struct
ethhdr'
struct ethhdr {
^
In file included from /git/linux/samples/bpf/sock_example.c:26:0:
./usr/include/linux/if_ether.h:144:8: note: originally defined here
struct ethhdr {
^
scripts/Makefile.host:124: recipe for target
'samples/bpf/sock_example.o' failed
make[2]: *** [samples/bpf/sock_example.o] Error 1
/git/linux/Makefile:1658: recipe for target 'samples/bpf/' failed
So include net/if_ether.h for the needs of sock_example.h, using the
same include that sock_example.c uses.
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Joe Stringer <joe@ovn.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-m9avekl1b651qe1r1zd5tzz9@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r-- | samples/bpf/sock_example.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/bpf/sock_example.h b/samples/bpf/sock_example.h index 09f7fe7..d801406 100644 --- a/samples/bpf/sock_example.h +++ b/samples/bpf/sock_example.h @@ -4,7 +4,7 @@ #include <unistd.h> #include <string.h> #include <errno.h> -#include <net/ethernet.h> +#include <linux/if_ether.h> #include <net/if.h> #include <linux/if_packet.h> #include <arpa/inet.h> |