---

yaml
---
r: 41829
b: refs/heads/master
c: d448388
h: refs/heads/master
i:
  41827: 46c8ec8
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb7b4a0dcf67ae747406b58b1cdc875916019739
+refs/heads/master: d448388bdaca946aa2b07973cb72a9b834e530bf

trunk/net/sctp/sm_statefuns.c

@@ -5103,6 +5103,7 @@ static struct sctp_packet *sctp_ootb_pkt_new(const struct sctp_association *asoc
 	__u16 sport;
 	__u16 dport;
 	__u32 vtag;
+	union sctp_addr tmp;
 
 	/* Get the source and destination port from the inbound packet.  */
 	sport = ntohs(chunk->sctp_hdr->dest);
@@ -5140,7 +5141,8 @@ static struct sctp_packet *sctp_ootb_pkt_new(const struct sctp_association *asoc
 	/* Cache a route for the transport with the chunk's destination as
 	 * the source address.
 	 */
-	sctp_transport_route(transport, (union sctp_addr *)&chunk->dest,
+	flip_to_n(&tmp, &chunk->dest);
+	sctp_transport_route(transport, &tmp,
 			     sctp_sk(sctp_get_ctl_sock()));
 
 	packet = sctp_packet_init(&transport->packet, transport, sport, dport);

trunk/net/sctp/transport.c

@@ -253,19 +253,15 @@ void sctp_transport_route(struct sctp_transport *transport,
 	struct sctp_af *af = transport->af_specific;
 	union sctp_addr *daddr = &transport->ipaddr;
 	struct dst_entry *dst;
-	union sctp_addr tmp;
-	flip_to_n(&tmp, saddr);
 
-	dst = af->get_dst(asoc, daddr, &tmp);
+	dst = af->get_dst(asoc, daddr, saddr);
 
-	if (saddr) {
-		memcpy(&transport->saddr_h, saddr, sizeof(union sctp_addr));
-		flip_to_n(&transport->saddr, &transport->saddr_h);
-	} else {
+	if (saddr)
+		memcpy(&transport->saddr, saddr, sizeof(union sctp_addr));
+	else
 		af->get_saddr(asoc, dst, daddr, &transport->saddr);
-		flip_to_h(&transport->saddr_h, &transport->saddr);
-	}
 
+	flip_to_h(&transport->saddr_h, &transport->saddr);
 	transport->dst = dst;
 	if ((transport->param_flags & SPP_PMTUD_DISABLE) && transport->pathmtu) {
 		return;