From 00c6d0c301562d051af6a359b46a40eb9587bd42 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Mon, 2 Mar 2009 09:46:13 +0000
Subject: [PATCH] --- yaml --- r: 135036 b: refs/heads/master c:
 f61f6f82c90cbaa85270f26b89e3309a8c6e2e88 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/sctp/outqueue.c  | 3 ++-
 trunk/net/sctp/transport.c | 7 ++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f08ef5e8a75f..fb3cf8105429 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6db93a58f1745cfe1acc2e1a1d68afc3245eced
+refs/heads/master: f61f6f82c90cbaa85270f26b89e3309a8c6e2e88
diff --git a/trunk/net/sctp/outqueue.c b/trunk/net/sctp/outqueue.c
index bc411c896216..a367d15a21aa 100644
--- a/trunk/net/sctp/outqueue.c
+++ b/trunk/net/sctp/outqueue.c
@@ -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
diff --git a/trunk/net/sctp/transport.c b/trunk/net/sctp/transport.c
index 5c29b14ee9af..e5dde45c79d3 100644
--- a/trunk/net/sctp/transport.c
+++ b/trunk/net/sctp/transport.c
@@ -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;