Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 66263
b: refs/heads/master
c: 86426c2
h: refs/heads/master
i:
  66261: c2a327a
  66259: fabc063
  66255: f6e2657
v: v3
  • Loading branch information
Ilpo Järvinen authored and David S. Miller committed Oct 10, 2007
1 parent a11b0a4 commit 3f8c960
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 005903bc3a0e8473fef809e8775db52dcd3cde63
refs/heads/master: 86426c22d24e0c904012711a14cb5021f4a167dc
4 changes: 4 additions & 0 deletions trunk/net/ipv4/tcp_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 3f8c960

Please sign in to comment.