From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 21 Nov 2006 01:10:03 +0000 (-0800)
Subject: [SCTP]: sctp_transport_{init,new}() switched to net-endian.
X-Git-Tag: v2.6.20-rc2~6^2~13^2~216
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b488c7dd58f61e07b54e5d286c7b45c43dd52f1a;p=linux-2.6-omap-h63xx.git

[SCTP]: sctp_transport_{init,new}() switched to net-endian.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 4bd916c808c..7824aeaa3d6 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -564,7 +564,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
 		return peer;
 	}
 
-	peer = sctp_transport_new(addr, gfp);
+	peer = sctp_transport_new(&tmp, gfp);
 	if (!peer)
 		return NULL;
 
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 174acc3c552..c5362638d67 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -5105,6 +5105,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);
@@ -5135,7 +5136,8 @@ static struct sctp_packet *sctp_ootb_pkt_new(const struct sctp_association *asoc
 	}
 
 	/* Make a transport for the bucket, Eliza... */
-	transport = sctp_transport_new(sctp_source(chunk), GFP_ATOMIC);
+	flip_to_n(&tmp, sctp_source(chunk));
+	transport = sctp_transport_new(&tmp, GFP_ATOMIC);
 	if (!transport)
 		goto nomem;
 
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index bacd09448b8..e1448addcd9 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -61,8 +61,8 @@ static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer,
 						  gfp_t gfp)
 {
 	/* Copy in the address.  */
-	peer->ipaddr_h = *addr;
-	flip_to_n(&peer->ipaddr, &peer->ipaddr_h);
+	peer->ipaddr = *addr;
+	flip_to_h(&peer->ipaddr_h, &peer->ipaddr);
 	peer->af_specific = sctp_get_af_specific(addr->sa.sa_family);
 	peer->asoc = NULL;