diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2007-07-15 03:19:29 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-07-15 03:19:29 -0400 |
| commit | 0a9f2a467d8dacaf7e97469dba99ed2d07287d80 (patch) | |
| tree | 392b7ddccc4172a903147e6bf2217da6a8831c70 | |
| parent | 063ed369c97f8de4cce23bf93bebd7ffacb542ff (diff) | |
[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.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 69f9f1ef3ef6..4e5884ac8f29 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) | |||
| 1398 | * waiting for the first ACK and did not get it)... | 1398 | * waiting for the first ACK and did not get it)... |
| 1399 | */ | 1399 | */ |
| 1400 | if ((tp->frto_counter == 1) && !(flag&FLAG_DATA_ACKED)) { | 1400 | if ((tp->frto_counter == 1) && !(flag&FLAG_DATA_ACKED)) { |
| 1401 | tp->retrans_out += tcp_skb_pcount(skb); | 1401 | /* For some reason this R-bit might get cleared? */ |
| 1402 | if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_RETRANS) | ||
| 1403 | tp->retrans_out += tcp_skb_pcount(skb); | ||
| 1402 | /* ...enter this if branch just for the first segment */ | 1404 | /* ...enter this if branch just for the first segment */ |
| 1403 | flag |= FLAG_DATA_ACKED; | 1405 | flag |= FLAG_DATA_ACKED; |
| 1404 | } else { | 1406 | } else { |
