From 5a17adf2f2e5d18b9194e8fbb292bd4aa739ee38 Mon Sep 17 00:00:00 2001 From: Michio Honda Date: Thu, 16 Jun 2011 10:54:23 +0900 Subject: [PATCH] --- yaml --- r: 265536 b: refs/heads/master c: f207c050fb1c385e34946e57107e639831c7d557 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sctp/outqueue.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 902bee113ca4..5d2a2ad3dfb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a262f0cdf1f2916ea918dc329492abb5323d9a6c +refs/heads/master: f207c050fb1c385e34946e57107e639831c7d557 diff --git a/trunk/net/sctp/outqueue.c b/trunk/net/sctp/outqueue.c index a6d27bf563a5..14c2b06028ff 100644 --- a/trunk/net/sctp/outqueue.c +++ b/trunk/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) {