1 files changed, 23 insertions, 11 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index b4cd2b71953f..024c3ebd9661 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -474,6 +474,15 @@ static void sctp_association_destroy(struct sctp_association *asoc)
 void sctp_assoc_set_primary(struct sctp_association *asoc,
                             struct sctp_transport *transport)
 {
+        int changeover = 0;
+
+        /* it's a changeover only if we already have a primary path
+         * that we are changing
+         */
+        if (asoc->peer.primary_path != NULL &&
+            asoc->peer.primary_path != transport)
+                changeover = 1 ;
+
         asoc->peer.primary_path = transport;
 
         /* Set a default msg_name for events. */
@@ -499,12 +508,12 @@ void sctp_assoc_set_primary(struct sctp_association *asoc,
          * double switch to the same destination address.
          */
         if (transport->cacc.changeover_active)
-                transport->cacc.cycling_changeover = 1;
+                transport->cacc.cycling_changeover = changeover;
 
         /* 2) The sender MUST set CHANGEOVER_ACTIVE to indicate that
          * a changeover has occurred.
          */
-        transport->cacc.changeover_active = 1;
+        transport->cacc.changeover_active = changeover;
 
         /* 3) The sender MUST store the next TSN to be sent in
          * next_tsn_at_change.
@@ -1203,6 +1212,9 @@ void sctp_assoc_update_retran_path(struct sctp_association *asoc)
         struct list_head *head = &asoc->peer.transport_addr_list;
         struct list_head *pos;
 
+        if (asoc->peer.transport_count == 1)
+                return;
+
         /* Find the next transport in a round-robin fashion. */
         t = asoc->peer.retran_path;
         pos = &t->transports;
@@ -1217,6 +1229,15 @@ void sctp_assoc_update_retran_path(struct sctp_association *asoc)
 
                 t = list_entry(pos, struct sctp_transport, transports);
 
+                /* We have exhausted the list, but didn't find any
+                 * other active transports.  If so, use the next
+                 * transport.
+                 */
+                if (t == asoc->peer.retran_path) {
+                        t = next;
+                        break;
+                }
+
                 /* Try to find an active transport. */
 
                 if ((t->state == SCTP_ACTIVE) ||
@@ -1229,15 +1250,6 @@ void sctp_assoc_update_retran_path(struct sctp_association *asoc)
                         if (!next)
                                 next = t;
                 }
-
-                /* We have exhausted the list, but didn't find any
-                 * other active transports.  If so, use the next
-                 * transport.
-                 */
-                if (t == asoc->peer.retran_path) {
-                        t = next;
-                        break;
-                }
         }
 
         asoc->peer.retran_path = t;