diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-03-25 00:34:38 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:28:09 -0400 |
commit | e1c3e7ab6de9711d2e0e9daf369c6638582eb7e7 (patch) | |
tree | 2df5485e75fb622b0f587bf0c7273c83f0d66e62 | |
parent | 9af3912ec9e30509b76cb376abb65a4d8af27df3 (diff) |
[TCP]: cubic update for net-2.6.22
The following update received from Injong updates TCP cubic to the latest
version. I am running more complete tests and will have results after 4/1.
According to Injong: the new version improves on its scalability,
fairness and stability. So in all properties, we confirmed it shows better
performance.
NCSU results (for 2.6.18 and 2.6.20) available:
http://netsrv.csc.ncsu.edu/wiki/index.php/TCP_Testing
This version is described in a new Internet draft for CUBIC.
http://www.ietf.org/internet-drafts/draft-rhee-tcp-cubic-00.txt
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/tcp_cubic.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c index 15c580375002..296845be912b 100644 --- a/net/ipv4/tcp_cubic.c +++ b/net/ipv4/tcp_cubic.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * TCP CUBIC: Binary Increase Congestion control for TCP v2.0 | 2 | * TCP CUBIC: Binary Increase Congestion control for TCP v2.1 |
3 | * | 3 | * |
4 | * This is from the implementation of CUBIC TCP in | 4 | * This is from the implementation of CUBIC TCP in |
5 | * Injong Rhee, Lisong Xu. | 5 | * Injong Rhee, Lisong Xu. |
@@ -214,7 +214,9 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd) | |||
214 | if (ca->delay_min > 0) { | 214 | if (ca->delay_min > 0) { |
215 | /* max increment = Smax * rtt / 0.1 */ | 215 | /* max increment = Smax * rtt / 0.1 */ |
216 | min_cnt = (cwnd * HZ * 8)/(10 * max_increment * ca->delay_min); | 216 | min_cnt = (cwnd * HZ * 8)/(10 * max_increment * ca->delay_min); |
217 | if (ca->cnt < min_cnt) | 217 | |
218 | /* use concave growth when the target is above the origin */ | ||
219 | if (ca->cnt < min_cnt && t >= ca->bic_K) | ||
218 | ca->cnt = min_cnt; | 220 | ca->cnt = min_cnt; |
219 | } | 221 | } |
220 | 222 | ||
@@ -400,4 +402,4 @@ module_exit(cubictcp_unregister); | |||
400 | MODULE_AUTHOR("Sangtae Ha, Stephen Hemminger"); | 402 | MODULE_AUTHOR("Sangtae Ha, Stephen Hemminger"); |
401 | MODULE_LICENSE("GPL"); | 403 | MODULE_LICENSE("GPL"); |
402 | MODULE_DESCRIPTION("CUBIC TCP"); | 404 | MODULE_DESCRIPTION("CUBIC TCP"); |
403 | MODULE_VERSION("2.0"); | 405 | MODULE_VERSION("2.1"); |