diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-06 22:40:03 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-06 22:40:03 -0400 |
| commit | f3ffb6814408f29817fc84d40ecc9c796acaa3ab (patch) | |
| tree | b4702cbdbf2c4517a5986bbaa971495b0f92a877 /net/ipv4/tcp_highspeed.c | |
| parent | 5bafd76593f060540acbea3b61e3087e009aa269 (diff) | |
| parent | 1def630a6a49dda5bc89dfbd86656293640456f0 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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, | |||
| 135 | 135 | ||
| 136 | /* Do additive increase */ | 136 | /* Do additive increase */ |
| 137 | if (tp->snd_cwnd < tp->snd_cwnd_clamp) { | 137 | if (tp->snd_cwnd < tp->snd_cwnd_clamp) { |
| 138 | tp->snd_cwnd_cnt += ca->ai; | 138 | /* cwnd = cwnd + a(w) / cwnd */ |
| 139 | tp->snd_cwnd_cnt += ca->ai + 1; | ||
| 139 | if (tp->snd_cwnd_cnt >= tp->snd_cwnd) { | 140 | if (tp->snd_cwnd_cnt >= tp->snd_cwnd) { |
| 140 | tp->snd_cwnd_cnt -= tp->snd_cwnd; | 141 | tp->snd_cwnd_cnt -= tp->snd_cwnd; |
| 141 | tp->snd_cwnd++; | 142 | tp->snd_cwnd++; |