| Message ID | 6f96abeb0686645871a9b65dcb278a5dbccfb4ec.1543769794.git.baruch@tkos.co.il |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | [RESEND,iptables] include: extend the headers conflict workaround to in6.h | expand |
On Sun, Dec 02, 2018 at 06:56:34PM +0200, Baruch Siach wrote: > 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. Applied.
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index bacf8cd92116..042d8b1478e0 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. */
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. Cc: Florian Westphal <fw@strlen.de> Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- Original submission: https://www.spinics.net/lists/netfilter-devel/msg57029.html Resend for patchwork to catch this time hopefully. --- include/linux/netfilter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)