Skip to contentSkip to conversation

samples/bpf sock_example: Avoid getting ethhdr from two includes

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jan 5, 2017 BPF

lore
Share & tools
lore
#0 lore raw
Commit-ID:  ee12996c9d392ec61241ab6c74d257bc2122e0bc
Gitweb:     http://git.kernel.org/tip/ee12996c9d392ec61241ab6c74d257bc2122e0bc
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 27 Dec 2016 21:49:17 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 27 Dec 2016 21:49:17 -0300

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.

---
 samples/bpf/sock_example.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
samples/bpf/sock_example.h +1 -1
index 09f7fe7..d801406 100644
@@ -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>