projects/linux·commit 0a9f2a46

[TCP]: Verify the presence of RETRANS bit when leaving FRTO

0a9f2a46 · Ilpo Järvinen <[email protected]> · 2007-07-15 00:19:29 -07:00

For yet unknown reason, something cleared SACKED_RETRANS bit
underneath FRTO.

Signed-off-by: Ilpo Järvinen <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Commit
0a9f2a467d8dacaf7e97469dba99ed2d07287d80
Parents
063ed369

Changes

1 files changed · +3 −1

FileStatusAddDelContent
net/ipv4/tcp_input.cmodified+3−1View file

net/ipv4/tcp_input.c

View file
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 69f9f1e..4e5884a 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1398,7 +1398,9 @@ static void tcp_enter_frto_loss(struct sock *sk, int allowed_segments, int flag)
* waiting for the first ACK and did not get it)...
*/
if ((tp->frto_counter == 1) && !(flag&FLAG_DATA_ACKED)) {
- tp->retrans_out += tcp_skb_pcount(skb);
+ /* For some reason this R-bit might get cleared? */
+ if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_RETRANS)
+ tp->retrans_out += tcp_skb_pcount(skb);
/* ...enter this if branch just for the first segment */
flag |= FLAG_DATA_ACKED;
} else {