From 5c615a3c7384d56dca435b388eef138de7fce6ea Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 14 Jul 2012 23:19:16 +0200
Subject: [PATCH] build: do not attempt to build IPv6 parts if
 CONFIG_IP6_NF_IPTABLES=n

Checking for IPV6 is not sufficient, use IP6_NF_IPTABLES instead.
---
 doc/changelog.txt           | 2 +-
 extensions/Kbuild           | 2 +-
 extensions/compat_xtables.c | 2 +-
 extensions/xt_RAWNAT.c      | 3 +--
 extensions/xt_SYSRQ.c       | 2 +-
 extensions/xt_TARPIT.c      | 2 +-
 extensions/xt_TEE.c         | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 306a07a..f5eed3a 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,7 +3,7 @@ HEAD
 ====
 Fixes:
 - SYSRQ: fix double target initialization at module load
-- build: do not attempt to build IPv6 parts if CONFIG_IPV6=n
+- build: do not attempt to build IPv6 parts if CONFIG_IP6_NF_IPTABLES=n
 Enhancements:
 - TARPIT gained IPv6 support
 
diff --git a/extensions/Kbuild b/extensions/Kbuild
index 804fbc5..81a8b30 100644
--- a/extensions/Kbuild
+++ b/extensions/Kbuild
@@ -17,7 +17,7 @@ endif
 obj-${build_IPMARK}      += xt_IPMARK.o
 obj-${build_LOGMARK}     += xt_LOGMARK.o
 obj-${build_RAWNAT}      += xt_RAWNAT.o iptable_rawpost.o
-ifneq (${CONFIG_IPV6},)
+ifneq (${CONFIG_IP6_NF_IPTABLES},)
 obj-${build_RAWNAT}      += ip6table_rawpost.o
 endif
 obj-${build_SYSRQ}       += xt_SYSRQ.o
diff --git a/extensions/compat_xtables.c b/extensions/compat_xtables.c
index 503ca94..a8459d6 100644
--- a/extensions/compat_xtables.c
+++ b/extensions/compat_xtables.c
@@ -26,7 +26,7 @@
 #endif
 #include "compat_skbuff.h"
 #include "compat_xtnu.h"
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
 #	define WITH_IPV6 1
 #endif
 
diff --git a/extensions/xt_RAWNAT.c b/extensions/xt_RAWNAT.c
index bebcfe5..a837276 100644
--- a/extensions/xt_RAWNAT.c
+++ b/extensions/xt_RAWNAT.c
@@ -22,8 +22,7 @@
 #include <net/ipv6.h>
 #include "compat_xtables.h"
 #include "xt_RAWNAT.h"
-
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
 #	define WITH_IPV6 1
 #endif
 
diff --git a/extensions/xt_SYSRQ.c b/extensions/xt_SYSRQ.c
index bd05cd7..35502ef 100644
--- a/extensions/xt_SYSRQ.c
+++ b/extensions/xt_SYSRQ.c
@@ -30,7 +30,7 @@
     (defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE))
 #	define WITH_CRYPTO 1
 #endif
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
 #	define WITH_IPV6 1
 #endif
 
diff --git a/extensions/xt_TARPIT.c b/extensions/xt_TARPIT.c
index a56f2bd..f9d89e6 100644
--- a/extensions/xt_TARPIT.c
+++ b/extensions/xt_TARPIT.c
@@ -55,7 +55,7 @@
 #include <net/tcp.h>
 #include "compat_xtables.h"
 #include "xt_TARPIT.h"
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
 #	define WITH_IPV6 1
 #endif
 
diff --git a/extensions/xt_TEE.c b/extensions/xt_TEE.c
index fb9538f..791a8fa 100644
--- a/extensions/xt_TEE.c
+++ b/extensions/xt_TEE.c
@@ -33,7 +33,7 @@
 #	define WITH_CONNTRACK 1
 #	include <net/netfilter/nf_conntrack.h>
 #endif
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
 #	define WITH_IPV6 1
 #endif