From 0aa1aae1a7383191bd8e7b37a0a8a27943988247 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Fri, 30 Apr 2010 21:42:43 -0400
Subject: [PATCH] --- yaml --- r: 194631 b: refs/heads/master c:
 bd69b981a354be40cc709f3046f0c56f00da6163 h: refs/heads/master i:   194629:
 6d0b51108eb2f2018151e1c65e3045e662c58c3e   194627:
 33db7ec19ae108dfa3664b62d3ea7a386a3824a0   194623:
 8158183ef84613e15625bb6e7febfe163cd2dd8a v: v3

---
 [refs]                    | 2 +-
 trunk/net/sctp/outqueue.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e36c6ee95b87..158cb6fce57f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c17b02b38aa99ef806c7066ef19a6f51122304f1
+refs/heads/master: bd69b981a354be40cc709f3046f0c56f00da6163
diff --git a/trunk/net/sctp/outqueue.c b/trunk/net/sctp/outqueue.c
index abfc0b8dee74..16d451a62b3f 100644
--- a/trunk/net/sctp/outqueue.c
+++ b/trunk/net/sctp/outqueue.c
@@ -854,6 +854,12 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)
 			if (status  != SCTP_XMIT_OK) {
 				/* put the chunk back */
 				list_add(&chunk->list, &q->control_chunk_list);
+			} else if (chunk->chunk_hdr->type == SCTP_CID_FWD_TSN) {
+				/* PR-SCTP C5) If a FORWARD TSN is sent, the
+				 * sender MUST assure that at least one T3-rtx
+				 * timer is running.
+				 */
+				sctp_transport_reset_timers(transport, 0);
 			}
 			break;