aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>2007-07-15 00:19:29 -0700
committerDavid S. Miller <davem@davemloft.net>2007-07-15 00:19:29 -0700
commit0a9f2a467d8dacaf7e97469dba99ed2d07287d80 (patch)
tree392b7ddccc4172a903147e6bf2217da6a8831c70
parent063ed369c97f8de4cce23bf93bebd7ffacb542ff (diff)
downloadkernel_samsung_tuna-0a9f2a467d8dacaf7e97469dba99ed2d07287d80.zip
kernel_samsung_tuna-0a9f2a467d8dacaf7e97469dba99ed2d07287d80.tar.gz
kernel_samsung_tuna-0a9f2a467d8dacaf7e97469dba99ed2d07287d80.tar.bz2
[TCP]: Verify the presence of RETRANS bit when leaving FRTO
For yet unknown reason, something cleared SACKED_RETRANS bit underneath FRTO. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/tcp_input.c4
1 files changed, 3 insertions, 1 deletions
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 {