From: Baruch Siach <baruch@tkos.co.il>
Date: Sun, 2 Dec 2018 16:56:34 +0000 (+0200)
Subject: include: extend the headers conflict workaround to in6.h
X-Git-Tag: v1.8.3~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2908eda10bf9fc81119d4f3ad672c67918ab5955;p=thirdparty%2Fiptables.git

include: extend the headers conflict workaround to in6.h

Commit 8d9d7e4b9ef ("include: fix build with kernel headers before 4.2")
introduced a kernel/user headers conflict workaround that allows build
of iptables with kernel headers older than 4.2. This minor extension
allows build with kernel headers older than 3.12, which is the version
that introduced explicit IP headers synchronization.

Fixes: 8d9d7e4b9ef4 ("include: fix build with kernel headers before 4.2")
Cc: Florian Westphal <fw@strlen.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index bacf8cd9..042d8b14 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -5,8 +5,8 @@
 
 #ifndef _NETINET_IN_H
 #include <linux/in.h>
-#endif
 #include <linux/in6.h>
+#endif
 #include <limits.h>
 
 /* Responses from hook functions. */