summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2018-11-13 19:22:08 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2018-11-13 21:12:57 +0100
commit51d374ba41ae4f1bb851228c06b030b83dd2092f (patch)
treef1f48a406195c804ad45c4db94a8b9904adda535 /extensions
parentd89cdfae64875c0ce33016e1342dcea4fbdc0323 (diff)
ebtables: vlan: fix userspace/kernel headers collision
Build with musl libc fails because of conflicting struct ethhdr definitions: In file included from .../sysroot/usr/include/net/ethernet.h:10:0, from ../iptables/nft-bridge.h:8, from libebt_vlan.c:18: .../sysroot/usr/include/netinet/if_ether.h:107:8: error: redefinition of ‘struct ethhdr’ struct ethhdr { ^~~~~~ In file included from libebt_vlan.c:16:0: .../sysroot/usr/include/linux/if_ether.h:160:8: note: originally defined here struct ethhdr { ^~~~~~ Include the userspace header first for the definition suppression logic to do the right thing. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'extensions')
-rw-r--r--extensions/libebt_vlan.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/extensions/libebt_vlan.c b/extensions/libebt_vlan.c
index 4a2eb712..be269c6c 100644
--- a/extensions/libebt_vlan.c
+++ b/extensions/libebt_vlan.c
@@ -12,6 +12,7 @@
#include <getopt.h>
#include <ctype.h>
#include <xtables.h>
+#include <netinet/if_ether.h>
#include <linux/netfilter_bridge/ebt_vlan.h>
#include <linux/if_ether.h>
#include "iptables/nft.h"