diff options
| author | Kees Cook <keescook@chromium.org> | 2012-10-02 11:19:48 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2013-01-11 11:40:00 -0800 |
| commit | aec9a0eb5f4615407a5ec2949eaa5f07ee82143a (patch) | |
| tree | ce18865324c903094f55704d3f755624c21aff31 /net | |
| parent | f4671a90c418b5aae14b61a9fc9d79c629403ca0 (diff) | |
| download | op-kernel-dev-aec9a0eb5f4615407a5ec2949eaa5f07ee82143a.zip op-kernel-dev-aec9a0eb5f4615407a5ec2949eaa5f07ee82143a.tar.gz | |
net/ipv4/netfilter: remove depends on CONFIG_EXPERIMENTAL
The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
while now and is almost always enabled by default. As agreed during the
Linux kernel summit, remove it from any "depends on" lines in Kconfigs.
CC: Pablo Neira Ayuso <pablo@netfilter.org>
CC: Patrick McHardy <kaber@trash.net>
CC: "David S. Miller" <davem@davemloft.net>
CC: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
CC: James Morris <jmorris@namei.org>
CC: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index d8d6f2a..ce2d43e 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/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 |
