diff options
| author | Vlad Yasevich <vladislav.yasevich@hp.com> | 2009-01-22 14:52:43 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-22 14:52:43 -0800 |
| commit | 6574df9a89f9f7da3a4e5cee7633d430319d3350 (patch) | |
| tree | 37b9a97e2fdaa5b0359957662c782e3daa57186a /net | |
| parent | 9c5ff5f75d0d0a1c7928ecfae3f38418b51a88e3 (diff) | |
| download | linux-stable-6574df9a89f9f7da3a4e5cee7633d430319d3350.tar.gz linux-stable-6574df9a89f9f7da3a4e5cee7633d430319d3350.tar.bz2 linux-stable-6574df9a89f9f7da3a4e5cee7633d430319d3350.zip | |
sctp: Correctly start rtx timer on new packet transmissions.
Commit 62aeaff5ccd96462b7077046357a6d7886175a57
(sctp: Start T3-RTX timer when fast retransmitting lowest TSN)
introduced a regression where it was possible to forcibly
restart the sctp retransmit timer at the transmission of any
new chunk. This resulted in much longer timeout times and
sometimes hung sctp connections.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sctp/outqueue.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index 247ebc95c1e5..bc411c896216 100644 --- a/net/sctp/outqueue.c +++ b/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; |