diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-05-16 14:00:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-17 16:06:01 -0400 |
| commit | ac9517fcf310327fa3e3b0d8366e4b11236b1b4b (patch) | |
| tree | 8dc61b909cf05632c77689a7607d8ed38caed559 /net/ipv4/tcp_input.c | |
| parent | 46bf466f08c9db0db1b77d3ecb5694926c73583a (diff) | |
| download | linux-ac9517fcf310327fa3e3b0d8366e4b11236b1b4b.tar.bz2 | |
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_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 85575888365a..10e6775464f6 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -2911,7 +2911,7 @@ static void tcp_update_rtt_min(struct sock *sk, u32 rtt_us) struct tcp_sock *tp = tcp_sk(sk); u32 wlen = sysctl_tcp_min_rtt_wlen * HZ; - minmax_running_min(&tp->rtt_min, wlen, tcp_time_stamp, + minmax_running_min(&tp->rtt_min, wlen, tcp_jiffies32, rtt_us ? : jiffies_to_usecs(1)); } |