---

yaml --- r: 194635 b: refs/heads/master c: fbdf501 h: refs/heads/master i: 194633: 99ea99b 194631: 0aa1aae v: v3
git-mirror · May 1, 2010 · 4234d47 · 4234d47
1 parent 68c0a80
commit 4234d47
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc4f841a05364b2572bcc266e9fd7e9cf5f06d5b
+refs/heads/master: fbdf501c9374966a56829ecca3a7f25d2b49a305
diff --git a/trunk/net/sctp/associola.c b/trunk/net/sctp/associola.c
@@ -762,7 +762,8 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
 		asoc->peer.retran_path = peer;
 	}
 
-	if (asoc->peer.active_path == asoc->peer.retran_path) {
+	if (asoc->peer.active_path == asoc->peer.retran_path &&
+	    peer->state != SCTP_UNCONFIRMED) {
 		asoc->peer.retran_path = peer;
 	}
 
@@ -1318,7 +1319,7 @@ void sctp_assoc_update_retran_path(struct sctp_association *asoc)
 			/* Keep track of the next transport in case
 			 * we don't find any active transport.
 			 */
-			if (!next)
+			if (t->state != SCTP_UNCONFIRMED && !next)
 				next = t;
 		}
 	}