From 3f03816754d36e5d02bcdbceb4187eba139635b1 Mon Sep 17 00:00:00 2001
From: "Angelo P. Castellani" <angelo.castellani+lkml@gmail.com>
Date: Tue, 16 May 2006 21:42:11 -0700
Subject: [PATCH] --- yaml --- r: 26783 b: refs/heads/master c:
 8872d8e1c4311dd7e5086975df9c76120a0be83b h: refs/heads/master i:   26781:
 cd54b9eb93a3d3498c03d9461a063435af21876d   26779:
 6dcfd9da5f83a5b83f5a1b040fd4f72ca4fea824   26775:
 276aca4f8f87fa88487ea3577fe0cc8ce2d92933   26767:
 f651baba702341d457c285f41729658ab6dff4f3   26751:
 7682f21b339032f1789fc9ea96e8863b7dae7f67 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 be1203681291..153857587010 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8fd0a73169e90022dc3ccf3083ca24573b44b5c
+refs/heads/master: 8872d8e1c4311dd7e5086975df9c76120a0be83b
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index 9f0cca4c4fae..4a538bc1683d 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -1662,6 +1662,8 @@ static void tcp_update_scoreboard(struct sock *sk, struct tcp_sock *tp)
 			if (!(TCP_SKB_CB(skb)->sacked&TCPCB_TAGBITS)) {
 				TCP_SKB_CB(skb)->sacked |= TCPCB_LOST;
 				tp->lost_out += tcp_skb_pcount(skb);
+				if (IsReno(tp))
+					tcp_remove_reno_sacks(sk, tp, tcp_skb_pcount(skb) + 1);
 
 				/* clear xmit_retrans hint */
 				if (tp->retransmit_skb_hint &&