Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 5 insertions, 1 deletions

diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index bc411c896216..d765fc53e74d 100644
--- a/net/sctp/outqueue.c
+++ b/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
@@ -1757,6 +1758,9 @@ static void sctp_generate_fwdtsn(struct sctp_outq *q, __u32 ctsn)
         struct sctp_chunk *chunk;
         struct list_head *lchunk, *temp;
 
+        if (!asoc->peer.prsctp_capable)
+                return;
+
         /* PR-SCTP C1) Let SackCumAck be the Cumulative TSN ACK carried in the
          * received SACK.
          *