---

yaml --- r: 168737 b: refs/heads/master c: a78102e h: refs/heads/master i: 168735: 00df045 v: v3
git-mirror · Nov 14, 2009 · f1841af · f1841af
1 parent 039996e
commit f1841af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9c67811ebc00a42f62f5d542d3abd36bd49ae35
+refs/heads/master: a78102e74e782914039cd8a6939532649825a2e3
diff --git a/trunk/net/sctp/transport.c b/trunk/net/sctp/transport.c
@@ -308,7 +308,8 @@ void sctp_transport_route(struct sctp_transport *transport,
 		/* Initialize sk->sk_rcv_saddr, if the transport is the
 		 * association's active path for getsockname().
 		 */
-		if (asoc && (transport == asoc->peer.active_path))
+		if (asoc && (!asoc->peer.primary_path ||
+				(transport == asoc->peer.active_path)))
 			opt->pf->af->to_sk_saddr(&transport->saddr,
 						 asoc->base.sk);
 	} else