aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_output.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2017-05-16 17:00:13 -0400
committerDavid S. Miller <davem@davemloft.net>2017-05-17 16:06:01 -0400
commitac9517fcf310327fa3e3b0d8366e4b11236b1b4b (patch)
tree8dc61b909cf05632c77689a7607d8ed38caed559 /net/ipv4/tcp_output.c
parent46bf466f08c9db0db1b77d3ecb5694926c73583a (diff)
tcp: replace misc tcp_time_stamp to tcp_jiffies32
After this patch, all uses of tcp_time_stamp will require a change when we introduce 1 ms and/or 1 us TCP TS option. 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 1011ea40c2ba..65472e931a0b 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2418,10 +2418,10 @@ bool tcp_schedule_loss_probe(struct sock *sk)
2418 timeout = max_t(u32, timeout, msecs_to_jiffies(10)); 2418 timeout = max_t(u32, timeout, msecs_to_jiffies(10));
2419 2419
2420 /* If RTO is shorter, just schedule TLP in its place. */ 2420 /* If RTO is shorter, just schedule TLP in its place. */
2421 tlp_time_stamp = tcp_time_stamp + timeout; 2421 tlp_time_stamp = tcp_jiffies32 + timeout;
2422 rto_time_stamp = (u32)inet_csk(sk)->icsk_timeout; 2422 rto_time_stamp = (u32)inet_csk(sk)->icsk_timeout;
2423 if ((s32)(tlp_time_stamp - rto_time_stamp) > 0) { 2423 if ((s32)(tlp_time_stamp - rto_time_stamp) > 0) {
2424 s32 delta = rto_time_stamp - tcp_time_stamp; 2424 s32 delta = rto_time_stamp - tcp_jiffies32;
2425 if (delta > 0) 2425 if (delta > 0)
2426 timeout = delta; 2426 timeout = delta;
2427 } 2427 }