From 58edde5d7d95114454d2ee866cf6b9cc9535a12f Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 20 Nov 2006 17:10:03 -0800
Subject: [PATCH] --- yaml --- r: 41819 b: refs/heads/master c:
 b488c7dd58f61e07b54e5d286c7b45c43dd52f1a h: refs/heads/master i:   41817:
 65d47c2687ca889be198bed78bd183bdda0d37a3   41815:
 1efff23e1d33cb2603e25fb12eca3d2d10883f48 v: v3

---
 [refs]                        | 2 +-
 trunk/net/sctp/associola.c    | 2 +-
 trunk/net/sctp/sm_statefuns.c | 4 +++-
 trunk/net/sctp/transport.c    | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c30025fe9240..bebfa2df0791 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d55c41b115e74b30a3d1a61db806bd03bdd9dd6f
+refs/heads/master: b488c7dd58f61e07b54e5d286c7b45c43dd52f1a
diff --git a/trunk/net/sctp/associola.c b/trunk/net/sctp/associola.c
index 4bd916c808c1..7824aeaa3d60 100644
--- a/trunk/net/sctp/associola.c
+++ b/trunk/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/trunk/net/sctp/sm_statefuns.c b/trunk/net/sctp/sm_statefuns.c
index 174acc3c5526..c5362638d672 100644
--- a/trunk/net/sctp/sm_statefuns.c
+++ b/trunk/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/trunk/net/sctp/transport.c b/trunk/net/sctp/transport.c
index bacd09448b8e..e1448addcd93 100644
--- a/trunk/net/sctp/transport.c
+++ b/trunk/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;