diff options
author | David S. Miller <davem@davemloft.net> | 2017-11-11 19:17:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-11-11 19:17:05 -0500 |
commit | fdae5f37a88caed9d2105f5a1ff609322f9e5416 (patch) | |
tree | 086808d640803b16286a318eb4d0895006de5c19 /net/ipv4/tcp_input.c | |
parent | 7c5556decd0a629e9ee02e93653f75ba7b7da03c (diff) | |
parent | b39545684a90ef3374abc0969d64c7bc540d128d (diff) |
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 94d729be42a9..c3447c5512fd 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -2554,7 +2554,6 @@ void tcp_simple_retransmit(struct sock *sk) | |||
2554 | struct tcp_sock *tp = tcp_sk(sk); | 2554 | struct tcp_sock *tp = tcp_sk(sk); |
2555 | struct sk_buff *skb; | 2555 | struct sk_buff *skb; |
2556 | unsigned int mss = tcp_current_mss(sk); | 2556 | unsigned int mss = tcp_current_mss(sk); |
2557 | u32 prior_lost = tp->lost_out; | ||
2558 | 2557 | ||
2559 | skb_rbtree_walk(skb, &sk->tcp_rtx_queue) { | 2558 | skb_rbtree_walk(skb, &sk->tcp_rtx_queue) { |
2560 | if (tcp_skb_seglen(skb) > mss && | 2559 | if (tcp_skb_seglen(skb) > mss && |
@@ -2569,7 +2568,7 @@ void tcp_simple_retransmit(struct sock *sk) | |||
2569 | 2568 | ||
2570 | tcp_clear_retrans_hints_partial(tp); | 2569 | tcp_clear_retrans_hints_partial(tp); |
2571 | 2570 | ||
2572 | if (prior_lost == tp->lost_out) | 2571 | if (!tp->lost_out) |
2573 | return; | 2572 | return; |
2574 | 2573 | ||
2575 | if (tcp_is_reno(tp)) | 2574 | if (tcp_is_reno(tp)) |