diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-06-15 07:32:39 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-06-15 07:32:39 -0500 |
| commit | b57ffdabee89d9af03d470803acf5f220722963f (patch) | |
| tree | 14eb53a4449f8950733c4fe8c33882cef6d9a454 /net/ipv4/tcp_input.c | |
| parent | 6cf74712ced25affec76636c39d4d625b82b218a (diff) | |
| parent | 0c94ab754b26e23ecdd6ddb1607c7a3e3f0f27fc (diff) | |
Merge tag 'lsk-v3.14-15.05' into linux-linaro-lng-v3.14
LSK 15.05 v3.14
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 22917918fa80..9fbd69efa999 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3064,10 +3064,11 @@ static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets, if (seq_rtt < 0) { seq_rtt = ca_seq_rtt; } - if (!(sacked & TCPCB_SACKED_ACKED)) + if (!(sacked & TCPCB_SACKED_ACKED)) { reord = min(pkts_acked, reord); - if (!after(scb->end_seq, tp->high_seq)) - flag |= FLAG_ORIG_SACK_ACKED; + if (!after(scb->end_seq, tp->high_seq)) + flag |= FLAG_ORIG_SACK_ACKED; + } } if (sacked & TCPCB_SACKED_ACKED) |