From: Donatas Abraitis Date: Wed, 2 Nov 2022 21:01:18 +0000 (+0200) Subject: zebra: Reuse netinet/if_ether.h to avoid redefinition of struct ethhdr X-Git-Tag: docker/8.4.0 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=25a8392b1aaabd16025051aca37bac702981412f;p=matthieu%2Ffrr.git zebra: Reuse netinet/if_ether.h to avoid redefinition of struct ethhdr 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 (cherry picked from commit 83f496bdf094d71e9bbe38f08f39426f8b1a139d) --- diff --git a/zebra/tc_netlink.c b/zebra/tc_netlink.c index 4fb0241d1d..afa03a4fa5 100644 --- a/zebra/tc_netlink.c +++ b/zebra/tc_netlink.c @@ -25,7 +25,7 @@ #ifdef HAVE_NETLINK -#include +#include #include #include "if.h"