diff options
author | Jeff Garzik | 2006-06-08 21:24:46 +0200 |
---|---|---|
committer | Jeff Garzik | 2006-06-08 21:24:46 +0200 |
commit | d15a88fc21ef225768ce31be16edfc9c6e2e02e3 (patch) | |
tree | d4cb0a1bc97973bb947e2667ae56bc4bc2256e9d /net/ipv4/tcp_highspeed.c | |
parent | Merge branch 'velocity' of git://electric-eye.fr.zoreil.com/home/romieu/linux... (diff) | |
parent | Linux 2.6.17-rc6 (diff) | |
download | kernel-qcow2-linux-d15a88fc21ef225768ce31be16edfc9c6e2e02e3.tar.gz kernel-qcow2-linux-d15a88fc21ef225768ce31be16edfc9c6e2e02e3.tar.xz kernel-qcow2-linux-d15a88fc21ef225768ce31be16edfc9c6e2e02e3.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'net/ipv4/tcp_highspeed.c')
-rw-r--r-- | net/ipv4/tcp_highspeed.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_highspeed.c b/net/ipv4/tcp_highspeed.c index b72fa55dfb84..ba7c63ca5bb1 100644 --- a/net/ipv4/tcp_highspeed.c +++ b/net/ipv4/tcp_highspeed.c @@ -135,7 +135,8 @@ static void hstcp_cong_avoid(struct sock *sk, u32 adk, u32 rtt, /* Do additive increase */ if (tp->snd_cwnd < tp->snd_cwnd_clamp) { - tp->snd_cwnd_cnt += ca->ai; + /* cwnd = cwnd + a(w) / cwnd */ + tp->snd_cwnd_cnt += ca->ai + 1; if (tp->snd_cwnd_cnt >= tp->snd_cwnd) { tp->snd_cwnd_cnt -= tp->snd_cwnd; tp->snd_cwnd++; |