diff options
Diffstat (limited to 'net/sctp/sm_sideeffect.c')
-rw-r--r-- | net/sctp/sm_sideeffect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index 8674d4919556..d771cc1b777a 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c | |||
@@ -217,8 +217,7 @@ static int sctp_gen_sack(struct sctp_association *asoc, int force, | |||
217 | sctp_add_cmd_sf(commands, SCTP_CMD_TIMER_RESTART, | 217 | sctp_add_cmd_sf(commands, SCTP_CMD_TIMER_RESTART, |
218 | SCTP_TO(SCTP_EVENT_TIMEOUT_SACK)); | 218 | SCTP_TO(SCTP_EVENT_TIMEOUT_SACK)); |
219 | } else { | 219 | } else { |
220 | if (asoc->a_rwnd > asoc->rwnd) | 220 | asoc->a_rwnd = asoc->rwnd; |
221 | asoc->a_rwnd = asoc->rwnd; | ||
222 | sack = sctp_make_sack(asoc); | 221 | sack = sctp_make_sack(asoc); |
223 | if (!sack) | 222 | if (!sack) |
224 | goto nomem; | 223 | goto nomem; |
@@ -480,7 +479,6 @@ static void sctp_do_8_2_transport_strike(struct sctp_association *asoc, | |||
480 | * that indicates that we have an outstanding HB. | 479 | * that indicates that we have an outstanding HB. |
481 | */ | 480 | */ |
482 | if (!is_hb || transport->hb_sent) { | 481 | if (!is_hb || transport->hb_sent) { |
483 | transport->last_rto = transport->rto; | ||
484 | transport->rto = min((transport->rto * 2), transport->asoc->rto_max); | 482 | transport->rto = min((transport->rto * 2), transport->asoc->rto_max); |
485 | } | 483 | } |
486 | } | 484 | } |
@@ -1418,6 +1416,8 @@ static int sctp_cmd_interpreter(sctp_event_t event_type, | |||
1418 | asoc->init_last_sent_to = t; | 1416 | asoc->init_last_sent_to = t; |
1419 | chunk->transport = t; | 1417 | chunk->transport = t; |
1420 | t->init_sent_count++; | 1418 | t->init_sent_count++; |
1419 | /* Set the new transport as primary */ | ||
1420 | sctp_assoc_set_primary(asoc, t); | ||
1421 | break; | 1421 | break; |
1422 | 1422 | ||
1423 | case SCTP_CMD_INIT_RESTART: | 1423 | case SCTP_CMD_INIT_RESTART: |