From: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date: Thu, 22 Feb 2007 06:54:52 +0000 (-0800)
Subject: [TCP] FRTO: Incorrectly clears TCPCB_EVER_RETRANS bit
X-Git-Tag: v2.6.22-rc1~1128^2~447
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=522e7548a9bd40305df41c0beae69448b7620d6b;p=linux-2.6-omap-h63xx.git

[TCP] FRTO: Incorrectly clears TCPCB_EVER_RETRANS bit

FRTO was slightly too brave... Should only clear
TCPCB_SACKED_RETRANS bit.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 1a14191687a..b21e232d5d3 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1266,7 +1266,7 @@ void tcp_enter_frto(struct sock *sk)
 	tp->undo_retrans = 0;
 
 	sk_stream_for_retrans_queue(skb, sk) {
-		TCP_SKB_CB(skb)->sacked &= ~TCPCB_RETRANS;
+		TCP_SKB_CB(skb)->sacked &= ~TCPCB_SACKED_RETRANS;
 	}
 	tcp_sync_left_out(tp);