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

Commit 9d729f72 authored by James Morris's avatar James Morris Committed by David S. Miller
Browse files

[NET]: Convert xtime.tv_sec to get_seconds() 



Where appropriate, convert references to xtime.tv_sec to the
get_seconds() helper function.

Signed-off-by: default avatarJames Morris <jmorris@namei.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 39df232f

include/net/tcp.h

+2 −2
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ static inline int tcp_paws_check(const struct tcp_options_received *rx_opt, int 
{

	if ((s32)(rx_opt->rcv_tsval - rx_opt->ts_recent) >= 0)

		return 0;

	if (xtime.tv_sec >= rx_opt->ts_recent_stamp + TCP_PAWS_24DAYS)

	if (get_seconds() >= rx_opt->ts_recent_stamp + TCP_PAWS_24DAYS)

		return 0;



	/* RST segments are not recommended to carry timestamp,
@@ -1029,7 +1029,7 @@ static inline int tcp_paws_check(const struct tcp_options_received *rx_opt, int 


	   However, we can relax time bounds for RST segments to MSL.

	 */

	if (rst && xtime.tv_sec >= rx_opt->ts_recent_stamp + TCP_PAWS_MSL)

	if (rst && get_seconds() >= rx_opt->ts_recent_stamp + TCP_PAWS_MSL)

		return 0;

	return 1;

}

net/ipv4/route.c

+1 −1
Original line number Diff line number Diff line
@@ -2683,7 +2683,7 @@ static int rt_fill_info(struct sk_buff *skb, u32 pid, u32 seq, int event, 
		id = rt->peer->ip_id_count;

		if (rt->peer->tcp_ts_stamp) {

			ts = rt->peer->tcp_ts;

			tsage = xtime.tv_sec - rt->peer->tcp_ts_stamp;

			tsage = get_seconds() - rt->peer->tcp_ts_stamp;

		}

	}

net/ipv4/tcp_input.c

+3 −3
Original line number Diff line number Diff line
@@ -2933,7 +2933,7 @@ static int tcp_fast_parse_options(struct sk_buff *skb, struct tcphdr *th, 
static inline void tcp_store_ts_recent(struct tcp_sock *tp)

{

	tp->rx_opt.ts_recent = tp->rx_opt.rcv_tsval;

	tp->rx_opt.ts_recent_stamp = xtime.tv_sec;

	tp->rx_opt.ts_recent_stamp = get_seconds();

}



static inline void tcp_replace_ts_recent(struct tcp_sock *tp, u32 seq)
@@ -2947,7 +2947,7 @@ static inline void tcp_replace_ts_recent(struct tcp_sock *tp, u32 seq) 
		 */



		if((s32)(tp->rx_opt.rcv_tsval - tp->rx_opt.ts_recent) >= 0 ||

		   xtime.tv_sec >= tp->rx_opt.ts_recent_stamp + TCP_PAWS_24DAYS)

		   get_seconds() >= tp->rx_opt.ts_recent_stamp + TCP_PAWS_24DAYS)

			tcp_store_ts_recent(tp);

	}

}
@@ -2999,7 +2999,7 @@ static inline int tcp_paws_discard(const struct sock *sk, const struct sk_buff * 
{

	const struct tcp_sock *tp = tcp_sk(sk);

	return ((s32)(tp->rx_opt.ts_recent - tp->rx_opt.rcv_tsval) > TCP_PAWS_WINDOW &&

		xtime.tv_sec < tp->rx_opt.ts_recent_stamp + TCP_PAWS_24DAYS &&

		get_seconds() < tp->rx_opt.ts_recent_stamp + TCP_PAWS_24DAYS &&

		!tcp_disordered_ack(sk, skb));

}

net/ipv4/tcp_ipv4.c

+5 −5
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp) 
	 */

	if (tcptw->tw_ts_recent_stamp &&

	    (twp == NULL || (sysctl_tcp_tw_reuse &&

			     xtime.tv_sec - tcptw->tw_ts_recent_stamp > 1))) {

			     get_seconds() - tcptw->tw_ts_recent_stamp > 1))) {

		tp->write_seq = tcptw->tw_snd_nxt + 65535 + 2;

		if (tp->write_seq == 0)

			tp->write_seq = 1;
@@ -224,7 +224,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
		 * when trying new connection.

		 */

		if (peer != NULL &&

		    peer->tcp_ts_stamp + TCP_PAWS_MSL >= xtime.tv_sec) {

		    peer->tcp_ts_stamp + TCP_PAWS_MSL >= get_seconds()) {

			tp->rx_opt.ts_recent_stamp = peer->tcp_ts_stamp;

			tp->rx_opt.ts_recent = peer->tcp_ts;

		}
@@ -1351,7 +1351,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
		    (dst = inet_csk_route_req(sk, req)) != NULL &&

		    (peer = rt_get_peer((struct rtable *)dst)) != NULL &&

		    peer->v4daddr == saddr) {

			if (xtime.tv_sec < peer->tcp_ts_stamp + TCP_PAWS_MSL &&

			if (get_seconds() < peer->tcp_ts_stamp + TCP_PAWS_MSL &&

			    (s32)(peer->tcp_ts - req->ts_recent) >

							TCP_PAWS_WINDOW) {

				NET_INC_STATS_BH(LINUX_MIB_PAWSPASSIVEREJECTED);
@@ -1770,7 +1770,7 @@ int tcp_v4_remember_stamp(struct sock *sk) 


	if (peer) {

		if ((s32)(peer->tcp_ts - tp->rx_opt.ts_recent) <= 0 ||

		    (peer->tcp_ts_stamp + TCP_PAWS_MSL < xtime.tv_sec &&

		    (peer->tcp_ts_stamp + TCP_PAWS_MSL < get_seconds() &&

		     peer->tcp_ts_stamp <= tp->rx_opt.ts_recent_stamp)) {

			peer->tcp_ts_stamp = tp->rx_opt.ts_recent_stamp;

			peer->tcp_ts = tp->rx_opt.ts_recent;
@@ -1791,7 +1791,7 @@ int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw) 
		const struct tcp_timewait_sock *tcptw = tcp_twsk((struct sock *)tw);



		if ((s32)(peer->tcp_ts - tcptw->tw_ts_recent) <= 0 ||

		    (peer->tcp_ts_stamp + TCP_PAWS_MSL < xtime.tv_sec &&

		    (peer->tcp_ts_stamp + TCP_PAWS_MSL < get_seconds() &&

		     peer->tcp_ts_stamp <= tcptw->tw_ts_recent_stamp)) {

			peer->tcp_ts_stamp = tcptw->tw_ts_recent_stamp;

			peer->tcp_ts	   = tcptw->tw_ts_recent;

net/ipv4/tcp_minisocks.c

+4 −4
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb, 
		tw->tw_substate	  = TCP_TIME_WAIT;

		tcptw->tw_rcv_nxt = TCP_SKB_CB(skb)->end_seq;

		if (tmp_opt.saw_tstamp) {

			tcptw->tw_ts_recent_stamp = xtime.tv_sec;

			tcptw->tw_ts_recent_stamp = get_seconds();

			tcptw->tw_ts_recent	  = tmp_opt.rcv_tsval;

		}
@@ -208,7 +208,7 @@ tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb, 


		if (tmp_opt.saw_tstamp) {

			tcptw->tw_ts_recent	  = tmp_opt.rcv_tsval;

			tcptw->tw_ts_recent_stamp = xtime.tv_sec;

			tcptw->tw_ts_recent_stamp = get_seconds();

		}



		inet_twsk_put(tw);
@@ -458,7 +458,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req, 


		if (newtp->rx_opt.tstamp_ok) {

			newtp->rx_opt.ts_recent = req->ts_recent;

			newtp->rx_opt.ts_recent_stamp = xtime.tv_sec;

			newtp->rx_opt.ts_recent_stamp = get_seconds();

			newtp->tcp_header_len = sizeof(struct tcphdr) + TCPOLEN_TSTAMP_ALIGNED;

		} else {

			newtp->rx_opt.ts_recent_stamp = 0;
@@ -504,7 +504,7 @@ struct sock *tcp_check_req(struct sock *sk,struct sk_buff *skb, 
			 * it can be estimated (approximately)

			 * from another data.

			 */

			tmp_opt.ts_recent_stamp = xtime.tv_sec - ((TCP_TIMEOUT_INIT/HZ)<<req->retrans);

			tmp_opt.ts_recent_stamp = get_seconds() - ((TCP_TIMEOUT_INIT/HZ)<<req->retrans);

			paws_reject = tcp_paws_check(&tmp_opt, th->rst);

		}

	}