Message ID | 20090430075554.GA12204@elte.hu |
---|---|
State | Superseded, archived |
Delegated to: | David Miller |
Headers | show |
From: Ingo Molnar <mingo@elte.hu> Date: Thu, 30 Apr 2009 09:55:54 +0200 > Revert "netfilter: Kconfig: TProxy doesn't depend on NF_CONNTRACK" > > This reverts commit 4b0706624930dc75c3b0d0df463d89759ef7de29. Thanks Ingo, I'll apply this revert soon unless Patrick wants to handle it differently. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 881203c..2329c5f 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -275,8 +275,6 @@ 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)" @@ -292,6 +290,8 @@ 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