Commit 628174cc authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

tcp: uses jiffies_32 to feed tp->chrono_start

tcp_time_stamp will no longer be tied to jiffies.
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c74df29a
...@@ -2757,7 +2757,7 @@ static void tcp_get_info_chrono_stats(const struct tcp_sock *tp, ...@@ -2757,7 +2757,7 @@ static void tcp_get_info_chrono_stats(const struct tcp_sock *tp,
for (i = TCP_CHRONO_BUSY; i < __TCP_CHRONO_MAX; ++i) { for (i = TCP_CHRONO_BUSY; i < __TCP_CHRONO_MAX; ++i) {
stats[i] = tp->chrono_stat[i - 1]; stats[i] = tp->chrono_stat[i - 1];
if (i == tp->chrono_type) if (i == tp->chrono_type)
stats[i] += tcp_time_stamp - tp->chrono_start; stats[i] += tcp_jiffies32 - tp->chrono_start;
stats[i] *= USEC_PER_SEC / HZ; stats[i] *= USEC_PER_SEC / HZ;
total += stats[i]; total += stats[i];
} }
......
...@@ -2202,7 +2202,7 @@ static bool tcp_small_queue_check(struct sock *sk, const struct sk_buff *skb, ...@@ -2202,7 +2202,7 @@ static bool tcp_small_queue_check(struct sock *sk, const struct sk_buff *skb,
static void tcp_chrono_set(struct tcp_sock *tp, const enum tcp_chrono new) static void tcp_chrono_set(struct tcp_sock *tp, const enum tcp_chrono new)
{ {
const u32 now = tcp_time_stamp; const u32 now = tcp_jiffies32;
if (tp->chrono_type > TCP_CHRONO_UNSPEC) if (tp->chrono_type > TCP_CHRONO_UNSPEC)
tp->chrono_stat[tp->chrono_type - 1] += now - tp->chrono_start; tp->chrono_stat[tp->chrono_type - 1] += now - tp->chrono_start;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment