diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /net/ipv4/Kconfig | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'net/ipv4/Kconfig')
| -rw-r--r-- | net/ipv4/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index e55136ae09f4..011cca7ae02b 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
| @@ -456,6 +456,14 @@ config TCP_CONG_BIC | |||
| 456 | increase provides TCP friendliness. | 456 | increase provides TCP friendliness. |
| 457 | See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/ | 457 | See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/ |
| 458 | 458 | ||
| 459 | config TCP_CONG_CUBIC | ||
| 460 | tristate "CUBIC TCP" | ||
| 461 | default m | ||
| 462 | ---help--- | ||
| 463 | This is version 2.0 of BIC-TCP which uses a cubic growth function | ||
| 464 | among other techniques. | ||
| 465 | See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/cubic-paper.pdf | ||
| 466 | |||
| 459 | config TCP_CONG_WESTWOOD | 467 | config TCP_CONG_WESTWOOD |
| 460 | tristate "TCP Westwood+" | 468 | tristate "TCP Westwood+" |
| 461 | default m | 469 | default m |