Merge branch 'master' into tk71

[mv-sheeva.git] / net / dccp / ccids / Kconfig

diff --git a/net/dccp/ccids/Kconfig b/net/dccp/ccids/Kconfig
index 8408398cd44e814cece7b9ec92615b1c615d32bd..0581143cb800d9b0b43bd86d0d2dcebf24abd3c1 100644 (file)
--- a/net/dccp/ccids/Kconfig
+++ b/net/dccp/ccids/Kconfig
@@ -47,37 +47,6 @@ config IP_DCCP_CCID3_DEBUG
 
          If in doubt, say N.
 
-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.
-
-           The TFRC nofeedback timer normally expires after the maximum of 4
-           RTTs and twice the current send interval (RFC 3448, 4.3). On LANs
-           with a small RTT this can mean a high processing load and reduced
-           performance, since then the nofeedback timer is triggered very
-           frequently.
-
-           This option enables to set a higher lower bound for the nofeedback
-           value. Values in units of milliseconds can be set here.
-
-           A value of 0 disables this feature by enforcing the value specified
-           in RFC 3448. The following values have been suggested as bounds for
-           experimental use:
-               * 16-20ms to match the typical multimedia inter-frame interval
-               * 100ms as a reasonable compromise [default]
-               * 1000ms corresponds to the lower TCP RTO bound (RFC 2988, 2.4)
-
-           The default of 100ms is a compromise between a large value for
-           efficient DCCP implementations, and a small value to avoid disrupting
-           the network in times of congestion.
-
-           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.
-
 config IP_DCCP_TFRC_LIB
        def_bool y if IP_DCCP_CCID3