Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70eabf0e authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

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: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ac35f562

include/net/tcp.h

+2 −2
Original line number Diff line number Diff line
@@ -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)

net/ipv4/tcp_input.c

+3 −3
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ static void tcp_event_data_recv(struct sock *sk, struct sk_buff *skb) 


	tcp_rcv_rtt_measure(tp);



	now = tcp_time_stamp;

	now = tcp_jiffies32;



	if (!icsk->icsk_ack.ato) {

		/* The _first_ data packet received, initialize
@@ -3636,7 +3636,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) 
	 */

	sk->sk_err_soft = 0;

	icsk->icsk_probes_out = 0;

	tp->rcv_tstamp = tcp_time_stamp;

	tp->rcv_tstamp = tcp_jiffies32;

	if (!prior_packets)

		goto no_queue;
@@ -5554,7 +5554,7 @@ void tcp_finish_connect(struct sock *sk, struct sk_buff *skb) 
	struct inet_connection_sock *icsk = inet_csk(sk);



	tcp_set_state(sk, TCP_ESTABLISHED);

	icsk->icsk_ack.lrcvtime = tcp_time_stamp;

	icsk->icsk_ack.lrcvtime = tcp_jiffies32;



	if (skb) {

		icsk->icsk_af_ops->sk_rx_dst_set(sk, skb);

net/ipv4/tcp_minisocks.c

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ struct sock *tcp_create_openreq_child(const struct sock *sk, 
		newtp->mdev_us = jiffies_to_usecs(TCP_TIMEOUT_INIT);

		minmax_reset(&newtp->rtt_min, tcp_time_stamp, ~0U);

		newicsk->icsk_rto = TCP_TIMEOUT_INIT;

		newicsk->icsk_ack.lrcvtime = tcp_time_stamp;

		newicsk->icsk_ack.lrcvtime = tcp_jiffies32;



		newtp->packets_out = 0;

		newtp->retrans_out = 0;

net/ipv4/tcp_output.c

+1 −1
Original line number Diff line number Diff line
@@ -3324,7 +3324,7 @@ static void tcp_connect_init(struct sock *sk) 
	if (likely(!tp->repair))

		tp->rcv_nxt = 0;

	else

		tp->rcv_tstamp = tcp_time_stamp;

		tp->rcv_tstamp = tcp_jiffies32;

	tp->rcv_wup = tp->rcv_nxt;

	tp->copied_seq = tp->rcv_nxt;

net/ipv4/tcp_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}