---

yaml
---
r: 27199
b: refs/heads/master
c: 79320d7
h: refs/heads/master
i:
  27197: 6d34dd2
  27195: 6e15b8b
  27191: c8ca945
  27183: 3b56f11
  27167: c07cc4c
  27135: 6a70082
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afec35e3fee900b3016519d0b5512064e4625b2c
+refs/heads/master: 79320d7e14900c549c3520791a297328f53ff71e

trunk/net/ipv4/tcp_input.c

@@ -1649,7 +1649,7 @@ static void tcp_update_scoreboard(struct sock *sk, struct tcp_sock *tp)
 	 * Hence, we can detect timed out packets during fast
 	 * retransmit without falling to slow start.
 	 */
-	if (tcp_head_timedout(sk, tp)) {
+	if (!IsReno(tp) && tcp_head_timedout(sk, tp)) {
 		struct sk_buff *skb;
 
 		skb = tp->scoreboard_skb_hint ? tp->scoreboard_skb_hint
@@ -1662,8 +1662,6 @@ 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 &&