diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-31 14:20:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-31 14:20:06 +0200 |
| commit | 3e83dfd5d8e374328078f527f1f7d189824896ab (patch) | |
| tree | 2f82b2e82f7a4b5c513fed42d4228a8bce938180 /net/ipv4/tcp_input.c | |
| parent | 3308376a914b9c3f57a12072c063814403d983a8 (diff) | |
| parent | 9e52fc2b50de3a1c08b44f94c610fbe998c0031a (diff) | |
| download | talos-op-linux-3e83dfd5d8e374328078f527f1f7d189824896ab.tar.gz talos-op-linux-3e83dfd5d8e374328078f527f1f7d189824896ab.zip | |
Merge branch 'x86/mm' into x86/platform, to pick up TLB flush dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 53de1424c13c..bab7f0493098 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3009,8 +3009,7 @@ void tcp_rearm_rto(struct sock *sk) /* delta_us may not be positive if the socket is locked * when the retrans timer fires and is rescheduled. */ - if (delta_us > 0) - rto = usecs_to_jiffies(delta_us); + rto = usecs_to_jiffies(max_t(int, delta_us, 1)); } inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto, TCP_RTO_MAX); |
