aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp/sm_statefuns.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-20 20:12:25 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:26:51 -0500
commit6a1e5f335461567f593e88b218f1c06817cbd323 (patch)
tree4cba2ea0f04c53d3f695bee61f164570a88633c9 /net/sctp/sm_statefuns.c
parent02a8a4db3b38ad2dd8bcfcca41694e043e44d282 (diff)
[SCTP]: sctp_process_init() and sctp_source() switched to net-endian.
both are done in one go since almost always we have result of the latter immediately passed to the former. Possibly non-obvious note: sctp_process_param() is endian-agnostic Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/sm_statefuns.c')
-rw-r--r--net/sctp/sm_statefuns.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index c5362638d672..0848309773a5 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -598,7 +598,6 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep,
598 struct sctp_ulpevent *ev, *ai_ev = NULL; 598 struct sctp_ulpevent *ev, *ai_ev = NULL;
599 int error = 0; 599 int error = 0;
600 struct sctp_chunk *err_chk_p; 600 struct sctp_chunk *err_chk_p;
601 union sctp_addr tmp;
602 601
603 /* If the packet is an OOTB packet which is temporarily on the 602 /* If the packet is an OOTB packet which is temporarily on the
604 * control endpoint, respond with an ABORT. 603 * control endpoint, respond with an ABORT.
@@ -666,9 +665,8 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep,
666 */ 665 */
667 peer_init = &chunk->subh.cookie_hdr->c.peer_init[0]; 666 peer_init = &chunk->subh.cookie_hdr->c.peer_init[0];
668 667
669 flip_to_h(&tmp, &chunk->subh.cookie_hdr->c.peer_addr);
670 if (!sctp_process_init(new_asoc, chunk->chunk_hdr->type, 668 if (!sctp_process_init(new_asoc, chunk->chunk_hdr->type,
671 &tmp, 669 &chunk->subh.cookie_hdr->c.peer_addr,
672 peer_init, GFP_ATOMIC)) 670 peer_init, GFP_ATOMIC))
673 goto nomem_init; 671 goto nomem_init;
674 672
@@ -5105,7 +5103,6 @@ static struct sctp_packet *sctp_ootb_pkt_new(const struct sctp_association *asoc
5105 __u16 sport; 5103 __u16 sport;
5106 __u16 dport; 5104 __u16 dport;
5107 __u32 vtag; 5105 __u32 vtag;
5108 union sctp_addr tmp;
5109 5106
5110 /* Get the source and destination port from the inbound packet. */ 5107 /* Get the source and destination port from the inbound packet. */
5111 sport = ntohs(chunk->sctp_hdr->dest); 5108 sport = ntohs(chunk->sctp_hdr->dest);
@@ -5136,8 +5133,7 @@ static struct sctp_packet *sctp_ootb_pkt_new(const struct sctp_association *asoc
5136 } 5133 }
5137 5134
5138 /* Make a transport for the bucket, Eliza... */ 5135 /* Make a transport for the bucket, Eliza... */
5139 flip_to_n(&tmp, sctp_source(chunk)); 5136 transport = sctp_transport_new(sctp_source(chunk), GFP_ATOMIC);
5140 transport = sctp_transport_new(&tmp, GFP_ATOMIC);
5141 if (!transport) 5137 if (!transport)
5142 goto nomem; 5138 goto nomem;
5143 5139