tcp: convert icsk_user_timeout from jiffies to msecs

This is a preparatory commit. Part of this series that improves the
socket TCP_USER_TIMEOUT option accuracy. Implement Eric Dumazets idea
to convert icsk->icsk_user_timeout from jiffies to msecs. To eliminate
the msecs_to_jiffies() and jiffies_to_msecs() dance in future.

Signed-off-by: Jon Maxwell <jmaxwell37@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 3b3611729928..fa34984d0b12 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -183,8 +183,9 @@ static bool retransmits_timed_out(struct sock *sk,
                 else
                         timeout = ((2 << linear_backoff_thresh) - 1) * rto_base +
                                 (boundary - linear_backoff_thresh) * TCP_RTO_MAX;
+                timeout = jiffies_to_msecs(timeout);
         }
-        return (tcp_time_stamp(tcp_sk(sk)) - start_ts) >= jiffies_to_msecs(timeout);
+        return (tcp_time_stamp(tcp_sk(sk)) - start_ts) >= timeout;
 }
 
 /* A write timeout has occurred. Process the after effects. */
@@ -337,8 +338,7 @@ static void tcp_probe_timer(struct sock *sk)
         if (!start_ts)
                 skb->skb_mstamp = tp->tcp_mstamp;
         else if (icsk->icsk_user_timeout &&
-                 (s32)(tcp_time_stamp(tp) - start_ts) >
-                 jiffies_to_msecs(icsk->icsk_user_timeout))
+                 (s32)(tcp_time_stamp(tp) - start_ts) > icsk->icsk_user_timeout)
                 goto abort;
 
         max_probes = sock_net(sk)->ipv4.sysctl_tcp_retries2;
@@ -672,7 +672,7 @@ static void tcp_keepalive_timer (struct timer_list *t)
                  * to determine when to timeout instead.
                  */
                 if ((icsk->icsk_user_timeout != 0 &&
-                    elapsed >= icsk->icsk_user_timeout &&
+                    elapsed >= msecs_to_jiffies(icsk->icsk_user_timeout) &&
                     icsk->icsk_probes_out > 0) ||
                     (icsk->icsk_user_timeout == 0 &&
                     icsk->icsk_probes_out >= keepalive_probes(tp))) {