diff options
author | Kees Cook <keescook@chromium.org> | 2012-10-02 11:20:07 -0700 |
---|---|---|
committer | Kees Cook <keescook@chromium.org> | 2013-01-11 11:40:03 -0800 |
commit | f215bf48c5db2e6d521aa6e175396c0896d4015e (patch) | |
tree | 9ed340bca72ee383931df7847a2340e40ca9a06b | |
parent | 70bd8f647e1a3aeda74b22a340edf96ed6a18b36 (diff) | |
download | linux-3.10-f215bf48c5db2e6d521aa6e175396c0896d4015e.tar.gz linux-3.10-f215bf48c5db2e6d521aa6e175396c0896d4015e.tar.bz2 linux-3.10-f215bf48c5db2e6d521aa6e175396c0896d4015e.zip |
net/xfrm: 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: "David S. Miller" <davem@davemloft.net>
CC: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/xfrm/Kconfig | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/xfrm/Kconfig b/net/xfrm/Kconfig index ce90b8d9236..bda1a13628a 100644 --- a/net/xfrm/Kconfig +++ b/net/xfrm/Kconfig @@ -21,8 +21,8 @@ config XFRM_USER If unsure, say Y. config XFRM_SUB_POLICY - bool "Transformation sub policy support (EXPERIMENTAL)" - depends on XFRM && EXPERIMENTAL + bool "Transformation sub policy support" + depends on XFRM ---help--- Support sub policy for developers. By using sub policy with main one, two policies can be applied to the same packet at once. @@ -31,8 +31,8 @@ config XFRM_SUB_POLICY If unsure, say N. config XFRM_MIGRATE - bool "Transformation migrate database (EXPERIMENTAL)" - depends on XFRM && EXPERIMENTAL + bool "Transformation migrate database" + depends on XFRM ---help--- A feature to update locator(s) of a given IPsec security association dynamically. This feature is required, for @@ -42,8 +42,8 @@ config XFRM_MIGRATE If unsure, say N. config XFRM_STATISTICS - bool "Transformation statistics (EXPERIMENTAL)" - depends on INET && XFRM && PROC_FS && EXPERIMENTAL + bool "Transformation statistics" + depends on INET && XFRM && PROC_FS ---help--- This statistics is not a SNMP/MIB specification but shows statistics about transformation error (or almost error) factor @@ -68,8 +68,8 @@ config NET_KEY Say Y unless you know what you are doing. config NET_KEY_MIGRATE - bool "PF_KEY MIGRATE (EXPERIMENTAL)" - depends on NET_KEY && EXPERIMENTAL + bool "PF_KEY MIGRATE" + depends on NET_KEY select XFRM_MIGRATE ---help--- Add a PF_KEY MIGRATE message to PF_KEYv2 socket family. |