| From 51d374ba41ae4f1bb851228c06b030b83dd2092f Mon Sep 17 00:00:00 2001 |
| From: Baruch Siach <baruch@tkos.co.il> |
| Date: Tue, 13 Nov 2018 19:22:08 +0200 |
| Subject: [PATCH] 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> |
| --- |
| Upstream status: commit 51d374ba41ae |
| |
| extensions/libebt_vlan.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/extensions/libebt_vlan.c b/extensions/libebt_vlan.c |
| index 4a2eb7126895..be269c6cdb4c 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" |
| -- |
| 2.19.1 |
| |