From: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date: Thu, 1 Nov 2007 07:10:18 +0000 (-0700)
Subject: [TCP]: Another TAGBITS -> SACKED_ACKED|LOST conversion
X-Git-Tag: v3.12-rc1~24920^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=261ab365fadd53ddc1b292b1663800e11fbf3e71;p=kernel%2Fkernel-generic.git

[TCP]: Another TAGBITS -> SACKED_ACKED|LOST conversion

Similar to commit 3eec0047d9bdd, point of this is to avoid
skipping R-bit skbs.

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 4d72781..ca9590f 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2078,7 +2078,7 @@ static void tcp_update_scoreboard(struct sock *sk)
 			if (!tcp_skb_timedout(sk, skb))
 				break;
 
-			if (!(TCP_SKB_CB(skb)->sacked&TCPCB_TAGBITS)) {
+			if (!(TCP_SKB_CB(skb)->sacked & (TCPCB_SACKED_ACKED|TCPCB_LOST))) {
 				TCP_SKB_CB(skb)->sacked |= TCPCB_LOST;
 				tp->lost_out += tcp_skb_pcount(skb);
 				tcp_verify_retransmit_hint(tp, skb);