dccp ccid-3: Tidy up CCID-Kconfig dependencies

The per-CCID menu has several dependencies on EXPERIMENTAL. These are redundant,
since net/dccp/ccids/Kconfig is sourced by net/dccp/Kconfig and since the
latter menu in turn asserts a dependency on EXPERIMENTAL.

The patch removes the redundant dependencies as well as the repeated reference
within the sub-menu.

Further changes:
----------------
Two single dependencies on CCID-3 are replaced with a single enclosing `if'.
    
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>

1 files changed, 4 insertions, 5 deletions

diff --git a/net/dccp/ccids/Kconfig b/net/dccp/ccids/Kconfig
index 44c7e90248fa..dc973abe03b4 100644
--- a/net/dccp/ccids/Kconfig
+++ b/net/dccp/ccids/Kconfig
@@ -1,8 +1,7 @@
 menu "DCCP CCIDs Configuration (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
 
 config IP_DCCP_CCID2
-        tristate "CCID2 (TCP-Like) (EXPERIMENTAL)"
+        tristate "CCID2 (TCP-Like)"
         def_tristate IP_DCCP
         ---help---
           CCID 2, TCP-like Congestion Control, denotes Additive Increase,
@@ -35,7 +34,7 @@ config IP_DCCP_CCID2_DEBUG
             If in doubt, say N.
 
 config IP_DCCP_CCID3
-        tristate "CCID3 (TCP-Friendly) (EXPERIMENTAL)"
+        tristate "CCID3 (TCP-Friendly)"
         def_tristate IP_DCCP
         select IP_DCCP_TFRC_LIB
         ---help---
@@ -63,9 +62,9 @@ config IP_DCCP_CCID3
 
           If in doubt, say M.
 
+if IP_DCCP_CCID3
 config IP_DCCP_CCID3_DEBUG
           bool "CCID3 debugging messages"
-          depends on IP_DCCP_CCID3
           ---help---
             Enable CCID3-specific debugging messages.
 
@@ -78,7 +77,6 @@ config IP_DCCP_CCID3_DEBUG
 config IP_DCCP_CCID3_RTO
           int "Use higher bound for nofeedback timer"
           default 100
-          depends on IP_DCCP_CCID3 && EXPERIMENTAL
           ---help---
             Use higher lower bound for nofeedback timer expiration.
 
@@ -105,6 +103,7 @@ config IP_DCCP_CCID3_RTO
             The purpose of the nofeedback timer is to slow DCCP down when there
             is serious network congestion: experimenting with larger values should
             therefore not be performed on WANs.
+endif   # IP_DCCP_CCID3
 
 config IP_DCCP_TFRC_LIB
         tristate