diff options
| author | Eric Dumazet | 2017-05-16 23:00:07 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-05-17 22:06:01 +0200 |
| commit | 70eabf0e1b8fe11519f793416655266605f700b9 (patch) | |
| tree | df4228d0a84ecc9e5899e4388e47d5f12cdf665d /include/net/tcp.h | |
| parent | tcp: bic, cubic: use tcp_jiffies32 instead of tcp_time_stamp (diff) | |
| download | kernel-qcow2-linux-70eabf0e1b8fe11519f793416655266605f700b9.tar.gz kernel-qcow2-linux-70eabf0e1b8fe11519f793416655266605f700b9.tar.xz kernel-qcow2-linux-70eabf0e1b8fe11519f793416655266605f700b9.zip | |
tcp: use tcp_jiffies32 for rcv_tstamp and lrcvtime
Use tcp_jiffies32 instead of tcp_time_stamp, since
tcp_time_stamp will soon be only used for 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 'include/net/tcp.h')
| -rw-r--r-- | include/net/tcp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index feba4c0406e5..5b2932b8363f 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1307,8 +1307,8 @@ static inline u32 keepalive_time_elapsed(const struct tcp_sock *tp) { const struct inet_connection_sock *icsk = &tp->inet_conn; - return min_t(u32, tcp_time_stamp - icsk->icsk_ack.lrcvtime, - tcp_time_stamp - tp->rcv_tstamp); + return min_t(u32, tcp_jiffies32 - icsk->icsk_ack.lrcvtime, + tcp_jiffies32 - tp->rcv_tstamp); } static inline int tcp_fin_time(const struct sock *sk) |