diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2007-10-11 17:33:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-10-11 17:33:11 -0700 |
| commit | 3eec0047d9bdd68fddef6539e77fee99ba2531f2 (patch) | |
| tree | 2cfb0d6737ffa136228d0b81c4e5b56a7d555280 /net | |
| parent | 16e906812f885cf16d95577dba260db6375ba571 (diff) | |
| download | op-kernel-dev-3eec0047d9bdd68fddef6539e77fee99ba2531f2.zip op-kernel-dev-3eec0047d9bdd68fddef6539e77fee99ba2531f2.tar.gz | |
[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')
| -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 e40857e..c827285 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, cnt += tcp_skb_pcount(skb); if (cnt > packets || after(TCP_SKB_CB(skb)->end_seq, high_seq)) 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); |
