diff options
| author |   Eric Dumazet <edumazet@google.com> | 2017-05-21 10:39:00 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-05-21 13:50:34 -0400 |
| commit | 4ab688793e086ef6d1744a0f803fe9770a1ae5d0 (patch) | |
| tree | f342b3db137bfbb54676d2f2bd041eea2883754d /net/ipv4 | |
| parent | ipv6: drop unused variables in seg6_genl_dumphac (diff) | |
| download | linux-dev-4ab688793e086ef6d1744a0f803fe9770a1ae5d0.tar.xz linux-dev-4ab688793e086ef6d1744a0f803fe9770a1ae5d0.zip | |
tcp: fix tcp_probe_timer() for TCP_USER_TIMEOUT
TCP_USER_TIMEOUT is still converted to jiffies value in
icsk_user_timeout
So we need to make a conversion for the cases HZ != 1000
Fixes: 9a568de4818d ("tcp: switch TCP TS option (RFC 7323) to 1ms clock")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 27a667bce806..c4a35ba7f8ed 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -341,7 +341,8 @@ static void tcp_probe_timer(struct sock *sk) if (!start_ts) tcp_send_head(sk)->skb_mstamp = tp->tcp_mstamp; else if (icsk->icsk_user_timeout && - (s32)(tcp_time_stamp(tp) - start_ts) > icsk->icsk_user_timeout) + (s32)(tcp_time_stamp(tp) - start_ts) > + jiffies_to_msecs(icsk->icsk_user_timeout)) goto abort; max_probes = sock_net(sk)->ipv4.sysctl_tcp_retries2; |