2 files changed, 8 insertions, 0 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 7eed77a39d0d..8e755ebff3b8 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -512,7 +512,13 @@ void sctp_assoc_set_primary(struct sctp_association *asoc,
          * to this destination address earlier. The sender MUST set
          * CYCLING_CHANGEOVER to indicate that this switch is a
          * double switch to the same destination address.
+         *
+         * Really, only bother is we have data queued or outstanding on
+         * the association.
          */
+        if (!asoc->outqueue.outstanding_bytes && !asoc->outqueue.out_qlen)
+                return;
+
         if (transport->cacc.changeover_active)
                 transport->cacc.cycling_changeover = changeover;
 
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index 8674d4919556..eda4fe783be5 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -1418,6 +1418,8 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
                         asoc->init_last_sent_to = t;
                         chunk->transport = t;
                         t->init_sent_count++;
+                        /* Set the new transport as primary */
+                        sctp_assoc_set_primary(asoc, t);
                         break;
 
                 case SCTP_CMD_INIT_RESTART: