From c69f0828bc3448004eb788badb8e984bf35fba98 Mon Sep 17 00:00:00 2001 From: Laszlo Attila Toth Date: Fri, 24 Apr 2009 16:55:25 +0200 Subject: [PATCH] --- yaml --- r: 144314 b: refs/heads/master c: 4b0706624930dc75c3b0d0df463d89759ef7de29 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/netfilter/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 28e59dfa1640..5e5b30123860 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ff482940f5aa2cdc3424c4a8ea94b9833b2af5f +refs/heads/master: 4b0706624930dc75c3b0d0df463d89759ef7de29 diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig index 2329c5f50551..881203c4a142 100644 --- a/trunk/net/netfilter/Kconfig +++ b/trunk/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