diff options
author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2007-10-11 20:33:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-10-11 20:33:11 -0400 |
commit | 3eec0047d9bdd68fddef6539e77fee99ba2531f2 (patch) | |
tree | 2cfb0d6737ffa136228d0b81c4e5b56a7d555280 /net/ipv4 | |
parent | 16e906812f885cf16d95577dba260db6375ba571 (diff) |
[TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L
This condition (plain R) can arise at least in recovery that
is triggered after tcp_undo_loss. There isn't any reason why
they should not be marked as lost, not marking makes in_flight
estimator to return too large values.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index e40857e073b3..c827285b488e 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -1987,7 +1987,7 @@ static void tcp_mark_head_lost(struct sock *sk, | |||
1987 | cnt += tcp_skb_pcount(skb); | 1987 | cnt += tcp_skb_pcount(skb); |
1988 | if (cnt > packets || after(TCP_SKB_CB(skb)->end_seq, high_seq)) | 1988 | if (cnt > packets || after(TCP_SKB_CB(skb)->end_seq, high_seq)) |
1989 | break; | 1989 | break; |
1990 | if (!(TCP_SKB_CB(skb)->sacked&TCPCB_TAGBITS)) { | 1990 | if (!(TCP_SKB_CB(skb)->sacked & (TCPCB_SACKED_ACKED|TCPCB_LOST))) { |
1991 | TCP_SKB_CB(skb)->sacked |= TCPCB_LOST; | 1991 | TCP_SKB_CB(skb)->sacked |= TCPCB_LOST; |
1992 | tp->lost_out += tcp_skb_pcount(skb); | 1992 | tp->lost_out += tcp_skb_pcount(skb); |
1993 | tcp_verify_retransmit_hint(tp, skb); | 1993 | tcp_verify_retransmit_hint(tp, skb); |