]> git.puffer.fish Git - matthieu/frr.git/commitdiff
zebra: Reuse netinet/if_ether.h to avoid redefinition of struct ethhdr docker/8.4.0
authorDonatas Abraitis <donatas@opensourcerouting.org>
Wed, 2 Nov 2022 21:01:18 +0000 (23:01 +0200)
committerDocker Builder <docker@frrouting.org>
Tue, 10 Jan 2023 21:29:35 +0000 (21:29 +0000)
In file included from /usr/include/net/ethernet.h:10,
                 from ./lib/prefix.h:26,
                 from zebra/tc_netlink.c:32:
/usr/include/netinet/if_ether.h:115:8: error: redefinition of 'struct ethhdr'
  115 | struct ethhdr {
      |        ^~~~~~
In file included from zebra/tc_netlink.c:28:
/usr/include/linux/if_ether.h:169:8: note: originally defined here
  169 | struct ethhdr {
      |        ^~~~~~

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 83f496bdf094d71e9bbe38f08f39426f8b1a139d)

zebra/tc_netlink.c

index 4fb0241d1d47d45ed7a51589b9a280a048f08ab0..afa03a4fa5689c922a62e904f6e55d32d95b70da 100644 (file)
@@ -25,7 +25,7 @@
 
 #ifdef HAVE_NETLINK
 
-#include <linux/if_ether.h>
+#include <netinet/if_ether.h>
 #include <sys/socket.h>
 
 #include "if.h"