diff options
author | 2017-05-16 14:00:13 -0700 | |
---|---|---|
committer | 2017-05-17 16:06:01 -0400 | |
commit | ac9517fcf310327fa3e3b0d8366e4b11236b1b4b (patch) | |
tree | 8dc61b909cf05632c77689a7607d8ed38caed559 /net/ipv4/tcp_output.c | |
parent | tcp_lp: cache tcp_time_stamp (diff) | |
download | linux-ac9517fcf310327fa3e3b0d8366e4b11236b1b4b.tar.gz linux-ac9517fcf310327fa3e3b0d8366e4b11236b1b4b.tar.bz2 linux-ac9517fcf310327fa3e3b0d8366e4b11236b1b4b.zip |
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.c | 4 |
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) timeout = max_t(u32, timeout, msecs_to_jiffies(10)); /* If RTO is shorter, just schedule TLP in its place. */ - tlp_time_stamp = tcp_time_stamp + timeout; + tlp_time_stamp = tcp_jiffies32 + timeout; rto_time_stamp = (u32)inet_csk(sk)->icsk_timeout; if ((s32)(tlp_time_stamp - rto_time_stamp) > 0) { - s32 delta = rto_time_stamp - tcp_time_stamp; + s32 delta = rto_time_stamp - tcp_jiffies32; if (delta > 0) timeout = delta; } |