Add proper Kconfig dependency for IP6_NF_TARGET_NFQUEUE, fwd from DaveM

diff --git a/queue/fix-incorrect-dependency-for-IP6_NF_TARGET_NFQUEUE.patch b/queue/fix-incorrect-dependency-for-IP6_NF_TARGET_NFQUEUE.patch
new file mode 100644 (file)
index 0000000..af7cf13
--- /dev/null
+++ b/queue/fix-incorrect-dependency-for-IP6_NF_TARGET_NFQUEUE.patch
@@ -0,0 +1,32 @@
+From stable-bounces@linux.kernel.org  Mon Dec 19 17:00:05 2005
+Date: Mon, 19 Dec 2005 16:58:12 -0800 (PST)
+Message-Id: <20051219.165812.85874968.davem@davemloft.net>
+To: stable@kernel.org
+From: "David S. Miller" <davem@davemloft.net>
+Subject: [NETFILTER]: Fix incorrect dependency for IP6_NF_TARGET_NFQUEUE
+
+From: Patrick McHardy <kaber@trash.net>
+
+IP6_NF_TARGET_NFQUEUE depends on IP6_NF_IPTABLES, not IP_NF_IPTABLES.
+
+Signed-off-by: Patrick McHardy <kaber@trash.net>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Chris Wright <chrisw@redhat.com>
+---
+
+ net/ipv6/netfilter/Kconfig |    2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+Index: linux-2.6.14.y/net/ipv6/netfilter/Kconfig
+===================================================================
+--- linux-2.6.14.y.orig/net/ipv6/netfilter/Kconfig
++++ linux-2.6.14.y/net/ipv6/netfilter/Kconfig
+@@ -211,7 +211,7 @@ config IP6_NF_TARGET_REJECT
+ 
+ config IP6_NF_TARGET_NFQUEUE
+       tristate "NFQUEUE Target Support"
+-      depends on IP_NF_IPTABLES
++      depends on IP6_NF_IPTABLES
+       help
+         This Target replaced the old obsolete QUEUE target.
+ 

diff --git a/queue/series b/queue/series
index bda352168019473432a4801675e05fec324aba35..ea95a98f00957966b2a11854145267b7b1772cfa 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -7,3 +7,4 @@ dpt_i2o-fix-for-deadlock-condition.patch
 gre-fix-hardware-checksum-modification.patch
 fix-vlan-checksumming.patch
 fix-nat-init-order.patch
+fix-incorrect-dependency-for-IP6_NF_TARGET_NFQUEUE.patch