diff options
author | Vlad Yasevich <vladislav.yasevich@hp.com> | 2010-04-30 22:41:09 -0400 |
---|---|---|
committer | Vlad Yasevich <vladislav.yasevich@hp.com> | 2010-04-30 22:41:09 -0400 |
commit | d9efc2231b28bc199f9de4dd594248b7341188e5 (patch) | |
tree | dd319348c6448a72fb10d1936edde25d8f593e9b /net/sctp/transport.c | |
parent | ae19c54866450f6c6f79223ca7d37965859a54e1 (diff) |
sctp: Do not force T3 timer on fast retransmissions.
We don't need to force the T3 timer any more and it's
actually wrong to do as it causes too long of a delay.
The timer will be started if one is not running, but if
one is running, we leave it alone.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Diffstat (limited to 'net/sctp/transport.c')
-rw-r--r-- | net/sctp/transport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/transport.c b/net/sctp/transport.c index be4d63d5a5cc..0ebb97fc98e0 100644 --- a/net/sctp/transport.c +++ b/net/sctp/transport.c | |||
@@ -195,7 +195,7 @@ static void sctp_transport_destroy(struct sctp_transport *transport) | |||
195 | /* Start T3_rtx timer if it is not already running and update the heartbeat | 195 | /* Start T3_rtx timer if it is not already running and update the heartbeat |
196 | * timer. This routine is called every time a DATA chunk is sent. | 196 | * timer. This routine is called every time a DATA chunk is sent. |
197 | */ | 197 | */ |
198 | void sctp_transport_reset_timers(struct sctp_transport *transport, int force) | 198 | void sctp_transport_reset_timers(struct sctp_transport *transport) |
199 | { | 199 | { |
200 | /* RFC 2960 6.3.2 Retransmission Timer Rules | 200 | /* RFC 2960 6.3.2 Retransmission Timer Rules |
201 | * | 201 | * |
@@ -205,7 +205,7 @@ void sctp_transport_reset_timers(struct sctp_transport *transport, int force) | |||
205 | * address. | 205 | * address. |
206 | */ | 206 | */ |
207 | 207 | ||
208 | if (force || !timer_pending(&transport->T3_rtx_timer)) | 208 | if (!timer_pending(&transport->T3_rtx_timer)) |
209 | if (!mod_timer(&transport->T3_rtx_timer, | 209 | if (!mod_timer(&transport->T3_rtx_timer, |
210 | jiffies + transport->rto)) | 210 | jiffies + transport->rto)) |
211 | sctp_transport_hold(transport); | 211 | sctp_transport_hold(transport); |