From: Laszlo Attila Toth <panther@balabit.hu>
Date: Fri, 24 Apr 2009 14:55:25 +0000 (+0200)
Subject: netfilter: Kconfig: TProxy doesn't depend on NF_CONNTRACK
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4b0706624930dc75c3b0d0df463d89759ef7de29;p=people%2Fssmith%2Fnetchannel2-pvops.bak.git%2F.git

netfilter: Kconfig: TProxy doesn't depend on NF_CONNTRACK

Signed-off-by: Laszlo Attila Toth <panther@balabit.hu>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 2329c5f5055..881203c4a14 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -275,6 +275,8 @@ config NF_CT_NETLINK
 	help
 	  This option enables support for a netlink-based userspace interface
 
+endif # NF_CONNTRACK
+
 # transparent proxy support
 config NETFILTER_TPROXY
 	tristate "Transparent proxying support (EXPERIMENTAL)"
@@ -290,8 +292,6 @@ config NETFILTER_TPROXY
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
-endif # NF_CONNTRACK
-
 config NETFILTER_XTABLES
 	tristate "Netfilter Xtables support (required for ip_tables)"
 	default m if NETFILTER_ADVANCED=n