1 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index bed379c7abcd..7374905b3701 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -387,7 +387,7 @@ void tcp_init_sock(struct sock *sk)
         INIT_LIST_HEAD(&tp->tsq_node);
 
         icsk->icsk_rto = TCP_TIMEOUT_INIT;
-        tp->mdev = TCP_TIMEOUT_INIT;
+        tp->mdev_us = jiffies_to_usecs(TCP_TIMEOUT_INIT);
 
         /* So many TCP implementations out there (incorrectly) count the
          * initial SYN frame in their delayed-ACK and congestion control
@@ -2339,7 +2339,7 @@ int tcp_disconnect(struct sock *sk, int flags)
 
         sk->sk_shutdown = 0;
         sock_reset_flag(sk, SOCK_DONE);
-        tp->srtt = 0;
+        tp->srtt_us = 0;
         if ((tp->write_seq += tp->max_window + 2) == 0)
                 tp->write_seq = 1;
         icsk->icsk_backoff = 0;
@@ -2783,8 +2783,8 @@ void tcp_get_info(const struct sock *sk, struct tcp_info *info)
 
         info->tcpi_pmtu = icsk->icsk_pmtu_cookie;
         info->tcpi_rcv_ssthresh = tp->rcv_ssthresh;
-        info->tcpi_rtt = jiffies_to_usecs(tp->srtt)>>3;
-        info->tcpi_rttvar = jiffies_to_usecs(tp->mdev)>>2;
+        info->tcpi_rtt = tp->srtt_us >> 3;
+        info->tcpi_rttvar = tp->mdev_us >> 2;
         info->tcpi_snd_ssthresh = tp->snd_ssthresh;
         info->tcpi_snd_cwnd = tp->snd_cwnd;
         info->tcpi_advmss = tp->advmss;