diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-02-14 13:28:29 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-02-14 13:28:31 +0100 |
commit | b366801c95bdbeda811ac9668a3943051a18c188 (patch) | |
tree | 79f08da2ad33a3159e67df344a4c411c88da7db6 /Documentation/networking/ip-sysctl.txt | |
parent | eff9073790e1286aa12bf1c65814d3e0132b12e1 (diff) | |
parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff) | |
download | lwn-b366801c95bdbeda811ac9668a3943051a18c188.tar.gz lwn-b366801c95bdbeda811ac9668a3943051a18c188.zip |
Merge commit 'v2.6.38-rc4' into x86/numa
Merge reason: Merge latest fixes before applying new patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/networking/ip-sysctl.txt')
-rw-r--r-- | Documentation/networking/ip-sysctl.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index d99940dcfc44..ac3b4a726a1a 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -187,7 +187,7 @@ tcp_cookie_size - INTEGER tcp_dsack - BOOLEAN Allows TCP to send "duplicate" SACKs. -tcp_ecn - BOOLEAN +tcp_ecn - INTEGER Enable Explicit Congestion Notification (ECN) in TCP. ECN is only used when both ends of the TCP flow support it. It is useful to avoid losses due to congestion (when the bottleneck router supports |