diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-25 17:46:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-25 17:46:34 -0700 |
| commit | 1c41e238e0beaac530c5c9d629e8dfbbadc4a099 (patch) | |
| tree | 4cfada93058fe1b8902ca8cda090fa71cd332133 /net/netfilter/Kconfig | |
| parent | 29fe1b481283a1bada994a69f65736db4ae6f35f (diff) | |
| parent | 37e55cf0ceb8803256bf69a3e45bd668bf90b76f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/netfilter/Kconfig')
| -rw-r--r-- | net/netfilter/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
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 |