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

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

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: 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 46bf466f

net/ipv4/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ void tcp_init_sock(struct sock *sk) 


	icsk->icsk_rto = TCP_TIMEOUT_INIT;

	tp->mdev_us = jiffies_to_usecs(TCP_TIMEOUT_INIT);

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

	minmax_reset(&tp->rtt_min, tcp_jiffies32, ~0U);



	/* So many TCP implementations out there (incorrectly) count the

	 * initial SYN frame in their delayed-ACK and congestion control

net/ipv4/tcp_htcp.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void measure_achieved_throughput(struct sock *sk, 
	const struct inet_connection_sock *icsk = inet_csk(sk);

	const struct tcp_sock *tp = tcp_sk(sk);

	struct htcp *ca = inet_csk_ca(sk);

	u32 now = tcp_time_stamp;

	u32 now = tcp_jiffies32;



	if (icsk->icsk_ca_state == TCP_CA_Open)

		ca->pkts_acked = sample->pkts_acked;

net/ipv4/tcp_input.c

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

}

net/ipv4/tcp_minisocks.c

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ struct sock *tcp_create_openreq_child(const struct sock *sk, 


		newtp->srtt_us = 0;

		newtp->mdev_us = jiffies_to_usecs(TCP_TIMEOUT_INIT);

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

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

		newicsk->icsk_rto = TCP_TIMEOUT_INIT;

		newicsk->icsk_ack.lrcvtime = tcp_jiffies32;

net/ipv4/tcp_output.c

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

	}