diff options
| author | Kees Cook <keescook@chromium.org> | 2012-10-02 14:20:07 -0400 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2013-01-11 14:40:03 -0500 |
| commit | f215bf48c5db2e6d521aa6e175396c0896d4015e (patch) | |
| tree | 9ed340bca72ee383931df7847a2340e40ca9a06b /net/xfrm | |
| parent | 70bd8f647e1a3aeda74b22a340edf96ed6a18b36 (diff) | |
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>
Diffstat (limited to 'net/xfrm')
| -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 ce90b8d92365..bda1a13628a8 100644 --- a/net/xfrm/Kconfig +++ b/net/xfrm/Kconfig | |||
| @@ -21,8 +21,8 @@ config XFRM_USER | |||
| 21 | If unsure, say Y. | 21 | If unsure, say Y. |
| 22 | 22 | ||
| 23 | config XFRM_SUB_POLICY | 23 | config XFRM_SUB_POLICY |
| 24 | bool "Transformation sub policy support (EXPERIMENTAL)" | 24 | bool "Transformation sub policy support" |
| 25 | depends on XFRM && EXPERIMENTAL | 25 | depends on XFRM |
| 26 | ---help--- | 26 | ---help--- |
| 27 | Support sub policy for developers. By using sub policy with main | 27 | Support sub policy for developers. By using sub policy with main |
| 28 | one, two policies can be applied to the same packet at once. | 28 | one, two policies can be applied to the same packet at once. |
| @@ -31,8 +31,8 @@ config XFRM_SUB_POLICY | |||
| 31 | If unsure, say N. | 31 | If unsure, say N. |
| 32 | 32 | ||
| 33 | config XFRM_MIGRATE | 33 | config XFRM_MIGRATE |
| 34 | bool "Transformation migrate database (EXPERIMENTAL)" | 34 | bool "Transformation migrate database" |
| 35 | depends on XFRM && EXPERIMENTAL | 35 | depends on XFRM |
| 36 | ---help--- | 36 | ---help--- |
| 37 | A feature to update locator(s) of a given IPsec security | 37 | A feature to update locator(s) of a given IPsec security |
| 38 | association dynamically. This feature is required, for | 38 | association dynamically. This feature is required, for |
| @@ -42,8 +42,8 @@ config XFRM_MIGRATE | |||
| 42 | If unsure, say N. | 42 | If unsure, say N. |
| 43 | 43 | ||
| 44 | config XFRM_STATISTICS | 44 | config XFRM_STATISTICS |
| 45 | bool "Transformation statistics (EXPERIMENTAL)" | 45 | bool "Transformation statistics" |
| 46 | depends on INET && XFRM && PROC_FS && EXPERIMENTAL | 46 | depends on INET && XFRM && PROC_FS |
| 47 | ---help--- | 47 | ---help--- |
| 48 | This statistics is not a SNMP/MIB specification but shows | 48 | This statistics is not a SNMP/MIB specification but shows |
| 49 | statistics about transformation error (or almost error) factor | 49 | statistics about transformation error (or almost error) factor |
| @@ -68,8 +68,8 @@ config NET_KEY | |||
| 68 | Say Y unless you know what you are doing. | 68 | Say Y unless you know what you are doing. |
| 69 | 69 | ||
| 70 | config NET_KEY_MIGRATE | 70 | config NET_KEY_MIGRATE |
| 71 | bool "PF_KEY MIGRATE (EXPERIMENTAL)" | 71 | bool "PF_KEY MIGRATE" |
| 72 | depends on NET_KEY && EXPERIMENTAL | 72 | depends on NET_KEY |
| 73 | select XFRM_MIGRATE | 73 | select XFRM_MIGRATE |
| 74 | ---help--- | 74 | ---help--- |
| 75 | Add a PF_KEY MIGRATE message to PF_KEYv2 socket family. | 75 | Add a PF_KEY MIGRATE message to PF_KEYv2 socket family. |