diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-05-16 23:00:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-17 22:06:01 +0200 |
| commit | 70eabf0e1b8fe11519f793416655266605f700b9 (patch) | |
| tree | df4228d0a84ecc9e5899e4388e47d5f12cdf665d /net/ipv4/tcp_timer.c | |
| parent | tcp: bic, cubic: use tcp_jiffies32 instead of tcp_time_stamp (diff) | |
| download | linux-70eabf0e1b8fe11519f793416655266605f700b9.tar.xz 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 'net/ipv4/tcp_timer.c')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 5f6f219a431e..9e0616cb8c17 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -451,7 +451,7 @@ void tcp_retransmit_timer(struct sock *sk) tp->snd_una, tp->snd_nxt); } #endif - if (tcp_time_stamp - tp->rcv_tstamp > TCP_RTO_MAX) { + if (tcp_jiffies32 - tp->rcv_tstamp > TCP_RTO_MAX) { tcp_write_err(sk); goto out; } |