From 2d61ec191bd0e4fb787b64e9e447d92221770f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Thu, 11 Oct 2007 17:32:31 -0700
Subject: [PATCH] --- yaml --- r: 67075 b: refs/heads/master c:
 16e906812f885cf16d95577dba260db6375ba571 h: refs/heads/master i:   67073:
 298f16a53eb09061ae79c48249ad8e3db3709d52   67071:
 b1e4fa7a52ca17fd29b2f01631c0da1c03f0e270 v: v3

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

diff --git a/[refs] b/[refs]
index fa720e86eac3..fee88255695b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4953f0fcc06a125f87874743d968c0e185c8b296
+refs/heads/master: 16e906812f885cf16d95577dba260db6375ba571
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index 101054cb13e9..e40857e073b3 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -1687,6 +1687,7 @@ static void tcp_enter_frto_loss(struct sock *sk, int allowed_segments, int flag)
 	tp->snd_cwnd_cnt = 0;
 	tp->snd_cwnd_stamp = tcp_time_stamp;
 	tp->frto_counter = 0;
+	tp->bytes_acked = 0;
 
 	tp->reordering = min_t(unsigned int, tp->reordering,
 					     sysctl_tcp_reordering);
@@ -2824,6 +2825,7 @@ static void tcp_conservative_spur_to_response(struct tcp_sock *tp)
 {
 	tp->snd_cwnd = min(tp->snd_cwnd, tp->snd_ssthresh);
 	tp->snd_cwnd_cnt = 0;
+	tp->bytes_acked = 0;
 	TCP_ECN_queue_cwr(tp);
 	tcp_moderate_cwnd(tp);
 }