diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 18:13:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 18:13:53 -0400 |
| commit | 90ca9a2ff4d6b89b6939c3ece19f8fed1eecdbab (patch) | |
| tree | c671df0bd9fa1a13da69ec57e3fdda1385e59729 /net/ipv4/Kconfig | |
| parent | 2c87e2cd0b57f63c226cd51f55ccc36867541a24 (diff) | |
| parent | 9faefb6d41f770e9cebad0fa180e7e78ef861211 (diff) | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD
* HEAD:
[DCCP]: Fix sparse warnings.
[TCP]: Remove TCP Compound
[BPQ] lockdep: fix false positive
[IPV4] inetpeer: Get rid of volatile from peer_total
[AX.25]: Get rid of the last volatile.
Diffstat (limited to 'net/ipv4/Kconfig')
| -rw-r--r-- | net/ipv4/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index da33393be45f..8514106761b0 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
| @@ -572,16 +572,6 @@ config TCP_CONG_VENO | |||
| 572 | loss packets. | 572 | loss packets. |
| 573 | See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf | 573 | See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf |
| 574 | 574 | ||
| 575 | config TCP_CONG_COMPOUND | ||
| 576 | tristate "TCP Compound" | ||
| 577 | depends on EXPERIMENTAL | ||
| 578 | default n | ||
| 579 | ---help--- | ||
| 580 | TCP Compound is a sender-side only change to TCP that uses | ||
| 581 | a mixed Reno/Vegas approach to calculate the cwnd. | ||
| 582 | For further details look here: | ||
| 583 | ftp://ftp.research.microsoft.com/pub/tr/TR-2005-86.pdf | ||
| 584 | |||
| 585 | endmenu | 575 | endmenu |
| 586 | 576 | ||
| 587 | config TCP_CONG_BIC | 577 | config TCP_CONG_BIC |