diff --git a/[refs] b/[refs] index ebc5bc3dea00..cec0642253e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc75689a4c4eb94b2fd7e3870347b9237ab39503 +refs/heads/master: d0ce92910bc04e107b2f3f2048f07e94f570035d diff --git a/trunk/net/sctp/outqueue.c b/trunk/net/sctp/outqueue.c index 992f361084b7..28f4fe77ceee 100644 --- a/trunk/net/sctp/outqueue.c +++ b/trunk/net/sctp/outqueue.c @@ -421,6 +421,13 @@ void sctp_retransmit_mark(struct sctp_outq *q, */ if ((fast_retransmit && (chunk->fast_retransmit > 0)) || (!fast_retransmit && !chunk->tsn_gap_acked)) { + /* If this chunk was sent less then 1 rto ago, do not + * retransmit this chunk, but give the peer time + * to acknowlege it. + */ + if ((jiffies - chunk->sent_at) < transport->rto) + continue; + /* RFC 2960 6.2.1 Processing a Received SACK * * C) Any time a DATA chunk is marked for