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

Commit f61f6f82 authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller
Browse files

sctp: use time_before or time_after for comparing jiffies 



The functions time_before or time_after are more robust
for comparing jiffies against other values.

Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c6db93a5

net/sctp/outqueue.c

+2 −1
Original line number Diff line number Diff line
@@ -428,7 +428,8 @@ void sctp_retransmit_mark(struct sctp_outq *q, 
			 * retransmitting due to T3 timeout.

			 */

			if (reason == SCTP_RTXR_T3_RTX &&

			    (jiffies - chunk->sent_at) < transport->last_rto)

			    time_before(jiffies, chunk->sent_at +

						 transport->last_rto))

				continue;



			/* RFC 2960 6.2.1 Processing a Received SACK

net/sctp/transport.c

+4 −3
Original line number Diff line number Diff line
@@ -543,8 +543,8 @@ void sctp_transport_lower_cwnd(struct sctp_transport *transport, 
		 * congestion indications more than once every window of

		 * data (or more loosely more than once every round-trip time).

		 */

		if ((jiffies - transport->last_time_ecne_reduced) >

		    transport->rtt) {

		if (time_after(jiffies, transport->last_time_ecne_reduced +

					transport->rtt)) {

			transport->ssthresh = max(transport->cwnd/2,

						  4*transport->asoc->pathmtu);

			transport->cwnd = transport->ssthresh;
@@ -561,7 +561,8 @@ void sctp_transport_lower_cwnd(struct sctp_transport *transport, 
		 * to be done every RTO interval, we do it every hearbeat

		 * interval.

		 */

		if ((jiffies - transport->last_time_used) > transport->rto)

		if (time_after(jiffies, transport->last_time_used +

					transport->rto))

			transport->cwnd = max(transport->cwnd/2,

						 4*transport->asoc->pathmtu);

		break;