Merge branch 'next' into for-linus

1 files changed, 4 insertions, 0 deletions

diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index a6d27bf563a5..14c2b06028ff 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -917,6 +917,8 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)
                  * current cwnd).
                  */
                 if (!list_empty(&q->retransmit)) {
+                        if (asoc->peer.retran_path->state == SCTP_UNCONFIRMED)
+                                goto sctp_flush_out;
                         if (transport == asoc->peer.retran_path)
                                 goto retran;
 
@@ -989,6 +991,8 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)
                             ((new_transport->state == SCTP_INACTIVE) ||
                              (new_transport->state == SCTP_UNCONFIRMED)))
                                 new_transport = asoc->peer.active_path;
+                        if (new_transport->state == SCTP_UNCONFIRMED)
+                                continue;
 
                         /* Change packets if necessary.  */
                         if (new_transport != transport) {