---

yaml --- r: 41830 b: refs/heads/master c: 16b0a03 h: refs/heads/master v: v3
git-mirror · Dec 3, 2006 · c19b73d · c19b73d
1 parent 378be97
commit c19b73d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d448388bdaca946aa2b07973cb72a9b834e530bf
+refs/heads/master: 16b0a030330d179427edffbeddaa5b7dc5b31196
diff --git a/trunk/net/sctp/sm_make_chunk.c b/trunk/net/sctp/sm_make_chunk.c
@@ -1033,7 +1033,7 @@ void sctp_init_addrs(struct sctp_chunk *chunk, union sctp_addr *src,
 {
 	memcpy(&chunk->source, src, sizeof(union sctp_addr));
 	flip_to_h(&chunk->source_h, &chunk->source);
-	flip_to_h(&chunk->dest, dest);
+	memcpy(&chunk->dest, dest, sizeof(union sctp_addr));
 }
 
 /* Extract the source address from a chunk.  */
@@ -1507,9 +1507,7 @@ struct sctp_association *sctp_unpack_cookie(
 
 	/* Also, add the destination address. */
 	if (list_empty(&retval->base.bind_addr.address_list)) {
-		union sctp_addr tmp;
-		flip_to_n(&tmp, &chunk->dest);
-		sctp_add_bind_addr(&retval->base.bind_addr, &tmp, 1,
+		sctp_add_bind_addr(&retval->base.bind_addr, &chunk->dest, 1,
 				   GFP_ATOMIC);
 	}
 

diff --git a/trunk/net/sctp/sm_statefuns.c b/trunk/net/sctp/sm_statefuns.c
@@ -5103,7 +5103,6 @@ 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);
@@ -5141,8 +5140,7 @@ 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.
 	 */
-	flip_to_n(&tmp, &chunk->dest);
-	sctp_transport_route(transport, &tmp,
+	sctp_transport_route(transport, (union sctp_addr *)&chunk->dest,
 			     sctp_sk(sctp_get_ctl_sock()));
 
 	packet = sctp_packet_init(&transport->packet, transport, sport, dport);