From e8718227d4f115a3e809295815ea329e3b5d6fcb Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Tue, 2 Oct 2012 11:19:48 -0700 Subject: [PATCH] --- yaml --- r: 353569 b: refs/heads/master c: aec9a0eb5f4615407a5ec2949eaa5f07ee82143a h: refs/heads/master i: 353567: ea0ec5c38ffd93ee9bfcfa1678b03df404b9ad08 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1a0fc4b1ad82..04dfd967686f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4671a90c418b5aae14b61a9fc9d79c629403ca0 +refs/heads/master: aec9a0eb5f4615407a5ec2949eaa5f07ee82143a diff --git a/trunk/net/ipv4/netfilter/Kconfig b/trunk/net/ipv4/netfilter/Kconfig index d8d6f2a5bf12..ce2d43e1f09f 100644 --- a/trunk/net/ipv4/netfilter/Kconfig +++ b/trunk/net/ipv4/netfilter/Kconfig @@ -241,8 +241,8 @@ config IP_NF_MANGLE To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_CLUSTERIP - tristate "CLUSTERIP target support (EXPERIMENTAL)" - depends on IP_NF_MANGLE && EXPERIMENTAL + tristate "CLUSTERIP target support" + depends on IP_NF_MANGLE depends on NF_CONNTRACK_IPV4 depends on NETFILTER_ADVANCED select NF_CONNTRACK_MARK