From ee2183e66b5cc8e93e28325b0d3917ea309f6a5d Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Fri, 2 Jun 2006 17:51:08 -0700
Subject: [PATCH] --- yaml --- r: 27086 b: refs/heads/master c:
 fb80a6e1a521eb298edb4365429d533dd39427fa h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/net/ipv4/tcp_highspeed.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dcac7aae52e5..066f5f1e5333 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f3262157899efd422228713a521504bdf0c991e
+refs/heads/master: fb80a6e1a521eb298edb4365429d533dd39427fa
diff --git a/trunk/net/ipv4/tcp_highspeed.c b/trunk/net/ipv4/tcp_highspeed.c
index b72fa55dfb84..ba7c63ca5bb1 100644
--- a/trunk/net/ipv4/tcp_highspeed.c
+++ b/trunk/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++;