diff options
| author | David S. Miller <davem@davemloft.net> | 2018-11-24 20:01:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-24 20:01:43 -0500 |
| commit | b1bf78bfb2e4c9ffa03ccdbc60d89a2f7c5fd82c (patch) | |
| tree | fcd93c3f54a72ca6a6ee97f015efebe6d80a3271 /net/ipv4/tcp_timer.c | |
| parent | aea0a897af9e44c258e8ab9296fad417f1bc063a (diff) | |
| parent | d146194f31c96f9b260c5a1cf1592d2e7f82a2e2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv4/tcp_timer.c')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 676020663ce8..5f8b6d3cd855 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c | |||
| @@ -740,7 +740,7 @@ static enum hrtimer_restart tcp_compressed_ack_kick(struct hrtimer *timer) | |||
| 740 | 740 | ||
| 741 | bh_lock_sock(sk); | 741 | bh_lock_sock(sk); |
| 742 | if (!sock_owned_by_user(sk)) { | 742 | if (!sock_owned_by_user(sk)) { |
| 743 | if (tp->compressed_ack) | 743 | if (tp->compressed_ack > TCP_FASTRETRANS_THRESH) |
| 744 | tcp_send_ack(sk); | 744 | tcp_send_ack(sk); |
| 745 | } else { | 745 | } else { |
| 746 | if (!test_and_set_bit(TCP_DELACK_TIMER_DEFERRED, | 746 | if (!test_and_set_bit(TCP_DELACK_TIMER_DEFERRED, |