aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_output.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2017-05-16 17:00:09 -0400
committerDavid S. Miller <davem@davemloft.net>2017-05-17 16:06:01 -0400
commit628174ccc45f648b83374d0a5bd554b0a88522ce (patch)
tree3875c027e01a432a83666110b36e297298116788 /net/ipv4/tcp_output.c
parentc74df29a8d119a09ccc5e50265e3383c76278f3d (diff)
tcp: uses jiffies_32 to feed tp->chrono_start
tcp_time_stamp will no longer be tied to jiffies. 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/tcp_output.c')
-rw-r--r--net/ipv4/tcp_output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index f0fd1b4fdb32..1011ea40c2ba 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2202,7 +2202,7 @@ static bool tcp_small_queue_check(struct sock *sk, const struct sk_buff *skb,
2202 2202
2203static void tcp_chrono_set(struct tcp_sock *tp, const enum tcp_chrono new) 2203static void tcp_chrono_set(struct tcp_sock *tp, const enum tcp_chrono new)
2204{ 2204{
2205 const u32 now = tcp_time_stamp; 2205 const u32 now = tcp_jiffies32;
2206 2206
2207 if (tp->chrono_type > TCP_CHRONO_UNSPEC) 2207 if (tp->chrono_type > TCP_CHRONO_UNSPEC)
2208 tp->chrono_stat[tp->chrono_type - 1] += now - tp->chrono_start; 2208 tp->chrono_stat[tp->chrono_type - 1] += now - tp->chrono_start;