From 3f8c960749f88b75dbace341c414cdf8b0340e0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Thu, 9 Aug 2007 14:45:17 +0300 Subject: [PATCH] --- yaml --- r: 66263 b: refs/heads/master c: 86426c22d24e0c904012711a14cb5021f4a167dc h: refs/heads/master i: 66261: c2a327ab40d0990d09f237909cf221119682c0da 66259: fabc0633faa5cbe9712310ae8e8f56e7feb97b02 66255: f6e2657d2ac2404fe29b9c74bebc2af6aa524c56 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_input.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 200fb74c5a4f..49b7d8323c89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 005903bc3a0e8473fef809e8775db52dcd3cde63 +refs/heads/master: 86426c22d24e0c904012711a14cb5021f4a167dc diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c index b11bd1624227..93823b83522b 100644 --- a/trunk/net/ipv4/tcp_input.c +++ b/trunk/net/ipv4/tcp_input.c @@ -1346,6 +1346,8 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ } } + tcp_verify_left_out(tp); + if ((reord < tp->fackets_out) && icsk->icsk_ca_state != TCP_CA_Loss && (!tp->frto_highmark || after(tp->snd_una, tp->frto_highmark))) tcp_update_reordering(sk, ((tp->fackets_out + 1) - reord), 0); @@ -2121,6 +2123,8 @@ static void tcp_try_to_open(struct sock *sk, int flag) { struct tcp_sock *tp = tcp_sk(sk); + tcp_verify_left_out(tp); + if (tp->retrans_out == 0) tp->retrans_stamp = 0;