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.

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 306a07a13c99263ff503ed4cd0b3ed8aaa2b592a..f5eed3a6953476adc91872461fbedaec99e2ce07 100644 (file)
--- 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 804fbc5b69e1b305fb4a26396010754be2d20a84..81a8b30817b494a192916bb4f5da709112a281f8 100644 (file)
--- 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 503ca94286786f3393de8a8ffd97735199b3eebf..a8459d645a68782c82e1a4c87ec6dcc09acd9f0e 100644 (file)
--- 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 bebcfe5afa45cecc3de742ab64e8ed8043096480..a837276fa8f536fab46a1960c7a640123a123f93 100644 (file)
--- 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 bd05cd7c95310603c314e6c7da37001e679ffb50..35502efac3279f088a4a5492badbc6f5fbb92834 100644 (file)
--- 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 a56f2bd028a16fc52a3e9fa762f09bac6639159c..f9d89e63fbf36a554995ce4f4a2f78dbd0a02e96 100644 (file)
--- 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 fb9538f29df885cb0f6b6daa21ccca6c99e69a1b..791a8fa20df6601fa0ff74b6032cc1b31ba711d7 100644 (file)
--- 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