diff options
Diffstat (limited to 'net/sctp/sm_sideeffect.c')
-rw-r--r-- | net/sctp/sm_sideeffect.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index efa516b47e81..4e4ca65cd320 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; |
@@ -718,7 +717,7 @@ static void sctp_cmd_new_state(sctp_cmd_seq_t *cmds, | |||
718 | 717 | ||
719 | if (sctp_style(sk, TCP)) { | 718 | if (sctp_style(sk, TCP)) { |
720 | /* Change the sk->sk_state of a TCP-style socket that has | 719 | /* Change the sk->sk_state of a TCP-style socket that has |
721 | * sucessfully completed a connect() call. | 720 | * successfully completed a connect() call. |
722 | */ | 721 | */ |
723 | if (sctp_state(asoc, ESTABLISHED) && sctp_sstate(sk, CLOSED)) | 722 | if (sctp_state(asoc, ESTABLISHED) && sctp_sstate(sk, CLOSED)) |
724 | sk->sk_state = SCTP_SS_ESTABLISHED; | 723 | sk->sk_state = SCTP_SS_ESTABLISHED; |
@@ -1417,6 +1416,8 @@ static int sctp_cmd_interpreter(sctp_event_t event_type, | |||
1417 | asoc->init_last_sent_to = t; | 1416 | asoc->init_last_sent_to = t; |
1418 | chunk->transport = t; | 1417 | chunk->transport = t; |
1419 | t->init_sent_count++; | 1418 | t->init_sent_count++; |
1419 | /* Set the new transport as primary */ | ||
1420 | sctp_assoc_set_primary(asoc, t); | ||
1420 | break; | 1421 | break; |
1421 | 1422 | ||
1422 | case SCTP_CMD_INIT_RESTART: | 1423 | case SCTP_CMD_INIT_RESTART: |