diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-21 17:06:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-21 17:06:42 -0700 |
| commit | e2a7c34fb2856fd5306e307e170e3dde358d0dce (patch) | |
| tree | afeb300b04186b1a1f649b2cd8a401a75878297c /net/ipv4/tcp_input.c | |
| parent | 7d3f0cd43feea1636dd7746f22fe8249b34d1b79 (diff) | |
| parent | 6470812e22261d2342ef1597be62e63a0423d691 (diff) | |
| download | blackbird-obmc-linux-e2a7c34fb2856fd5306e307e170e3dde358d0dce.tar.gz blackbird-obmc-linux-e2a7c34fb2856fd5306e307e170e3dde358d0dce.zip | |
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 d73903fe8c83..ddc854728a60 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); |
