diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-18 23:11:32 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-18 23:11:32 +0300 |
| commit | c6cd850d6568872f66fc4a4582f34f9b910066ca (patch) | |
| tree | e9a6370f7b0ce110e2916a6288a8fb0ee8323e37 /net/ipv4/tcp_input.c | |
| parent | 27902f08065ba61514c331b7d6e85635c1655d82 (diff) | |
| parent | 8b4822de59d5d9919b9b045183a36c673ce20b73 (diff) | |
| download | linux-c6cd850d6568872f66fc4a4582f34f9b910066ca.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -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 aa1eef150dc4..bbadd79815a4 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3190,7 +3190,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets, int delta; /* Non-retransmitted hole got filled? That's reordering */ - if (reord < prior_fackets) + if (reord < prior_fackets && reord <= tp->fackets_out) tcp_update_reordering(sk, tp->fackets_out - reord, 0); delta = tcp_is_fack(tp) ? pkts_acked : |