aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-20 20:13:38 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:26:55 -0500
commit16b0a030330d179427edffbeddaa5b7dc5b31196 (patch)
tree2d82def018e4b2b3fb8110cb8127735d4fc52f50
parentd448388bdaca946aa2b07973cb72a9b834e530bf (diff)
[SCTP]: Switch sctp_chunk ->dest to net-endian.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sctp/sm_make_chunk.c6
-rw-r--r--net/sctp/sm_statefuns.c4
2 files changed, 3 insertions, 7 deletions
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 44ddec90995..beee1aa09e7 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -1033,7 +1033,7 @@ void sctp_init_addrs(struct sctp_chunk *chunk, union sctp_addr *src,
1033{ 1033{
1034 memcpy(&chunk->source, src, sizeof(union sctp_addr)); 1034 memcpy(&chunk->source, src, sizeof(union sctp_addr));
1035 flip_to_h(&chunk->source_h, &chunk->source); 1035 flip_to_h(&chunk->source_h, &chunk->source);
1036 flip_to_h(&chunk->dest, dest); 1036 memcpy(&chunk->dest, dest, sizeof(union sctp_addr));
1037} 1037}
1038 1038
1039/* Extract the source address from a chunk. */ 1039/* Extract the source address from a chunk. */
@@ -1507,9 +1507,7 @@ no_hmac:
1507 1507
1508 /* Also, add the destination address. */ 1508 /* Also, add the destination address. */
1509 if (list_empty(&retval->base.bind_addr.address_list)) { 1509 if (list_empty(&retval->base.bind_addr.address_list)) {
1510 union sctp_addr tmp; 1510 sctp_add_bind_addr(&retval->base.bind_addr, &chunk->dest, 1,
1511 flip_to_n(&tmp, &chunk->dest);
1512 sctp_add_bind_addr(&retval->base.bind_addr, &tmp, 1,
1513 GFP_ATOMIC); 1511 GFP_ATOMIC);
1514 } 1512 }
1515 1513
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 42377f75ee1..0848309773a 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -5103,7 +5103,6 @@ static struct sctp_packet *sctp_ootb_pkt_new(const struct sctp_association *asoc
5103 __u16 sport; 5103 __u16 sport;
5104 __u16 dport; 5104 __u16 dport;
5105 __u32 vtag; 5105 __u32 vtag;
5106 union sctp_addr tmp;
5107 5106
5108 /* Get the source and destination port from the inbound packet. */ 5107 /* Get the source and destination port from the inbound packet. */
5109 sport = ntohs(chunk->sctp_hdr->dest); 5108 sport = ntohs(chunk->sctp_hdr->dest);
@@ -5141,8 +5140,7 @@ static struct sctp_packet *sctp_ootb_pkt_new(const struct sctp_association *asoc
5141 /* Cache a route for the transport with the chunk's destination as 5140 /* Cache a route for the transport with the chunk's destination as
5142 * the source address. 5141 * the source address.
5143 */ 5142 */
5144 flip_to_n(&tmp, &chunk->dest); 5143 sctp_transport_route(transport, (union sctp_addr *)&chunk->dest,
5145 sctp_transport_route(transport, &tmp,
5146 sctp_sk(sctp_get_ctl_sock())); 5144 sctp_sk(sctp_get_ctl_sock()));
5147 5145
5148 packet = sctp_packet_init(&transport->packet, transport, sport, dport); 5146 packet = sctp_packet_init(&transport->packet, transport, sport, dport);