From 69e261c90c62b217eed1e54eb0398fadb08cec81 Mon Sep 17 00:00:00 2001 From: Vlad Yasevich Date: Thu, 22 Jan 2009 14:52:43 -0800 Subject: [PATCH] --- yaml --- r: 130188 b: refs/heads/master c: 6574df9a89f9f7da3a4e5cee7633d430319d3350 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sctp/outqueue.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6a90a369a566..7a161b6dbd06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c5ff5f75d0d0a1c7928ecfae3f38418b51a88e3 +refs/heads/master: 6574df9a89f9f7da3a4e5cee7633d430319d3350 diff --git a/trunk/net/sctp/outqueue.c b/trunk/net/sctp/outqueue.c index 247ebc95c1e5..bc411c896216 100644 --- a/trunk/net/sctp/outqueue.c +++ b/trunk/net/sctp/outqueue.c @@ -929,7 +929,6 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout) } /* Finally, transmit new packets. */ - start_timer = 0; while ((chunk = sctp_outq_dequeue_data(q)) != NULL) { /* RFC 2960 6.5 Every DATA chunk MUST carry a valid * stream identifier. @@ -1028,7 +1027,7 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout) list_add_tail(&chunk->transmitted_list, &transport->transmitted); - sctp_transport_reset_timers(transport, start_timer-1); + sctp_transport_reset_timers(transport, 0); q->empty = 0;