]> err.no Git - linux-2.6/commitdiff
[TCP]: Fix left_out setting during FRTO
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Tue, 12 Jun 2007 23:16:44 +0000 (16:16 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 12 Jun 2007 23:16:44 +0000 (16:16 -0700)
Without FRTO, the tcp_try_to_open is never called with
lost_out > 0 (see tcp_time_to_recover). However, when FRTO is
enabled, the !tp->lost condition is not used until end of FRTO
because that way TCP avoids premature entry to fast recovery
during FRTO.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_input.c

index 74683d81c3f18f8c3450b3100ff89373179ea101..ed4a1bda822df87f58538edfd5c7394146c4e09d 100644 (file)
@@ -2037,7 +2037,7 @@ static void tcp_try_to_open(struct sock *sk, int flag)
 {
        struct tcp_sock *tp = tcp_sk(sk);
 
-       tp->left_out = tp->sacked_out;
+       tcp_sync_left_out(tp);
 
        if (tp->retrans_out == 0)
                tp->retrans_stamp = 0;