4 files changed, 12 insertions, 14 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 5b8971be9775..fa7cda4b1813 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -487,8 +487,8 @@ void sctp_assoc_rm_peer(struct sctp_association *asoc,
         SCTP_DEBUG_PRINTK_IPADDR("sctp_assoc_rm_peer:association %p addr: ",
                                  " port: %d\n",
                                  asoc,
-                                 (&peer->ipaddr_h),
-                                 peer->ipaddr_h.v4.sin_port);
+                                 (&peer->ipaddr),
+                                 ntohs(peer->ipaddr.v4.sin_port));
 
         /* If we are to remove the current retran_path, update it
          * to the next peer before removing this peer from the list.
@@ -1136,8 +1136,8 @@ void sctp_assoc_update_retran_path(struct sctp_association *asoc)
                                  " %p addr: ",
                                  " port: %d\n",
                                  asoc,
-                                 (&t->ipaddr_h),
-                                 t->ipaddr_h.v4.sin_port);
+                                 (&t->ipaddr),
+                                 ntohs(t->ipaddr.v4.sin_port));
 }
 
 /* Choose the transport for sending a INIT packet.  */
@@ -1161,8 +1161,8 @@ struct sctp_transport *sctp_assoc_choose_init_transport(
                                  " %p addr: ",
                                  " port: %d\n",
                                  asoc,
-                                 (&t->ipaddr_h),
-                                 t->ipaddr_h.v4.sin_port);
+                                 (&t->ipaddr),
+                                 ntohs(t->ipaddr.v4.sin_port));
 
         return t;
 }
@@ -1307,7 +1307,7 @@ int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *asoc,
         /* Use scoping rules to determine the subset of addresses from
          * the endpoint.
          */
-        scope = sctp_scope(&asoc->peer.active_path->ipaddr_h);
+        scope = sctp_scope(&asoc->peer.active_path->ipaddr);
         flags = (PF_INET6 == asoc->base.sk->sk_family) ? SCTP_ADDR6_ALLOWED : 0;
         if (asoc->peer.ipv4_address)
                 flags |= SCTP_ADDR4_PEERSUPP;
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 04d5e13e9183..a76ffc143894 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -161,7 +161,7 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport,
         /* Fill in the dest address from the route entry passed with the skb
          * and the source address from the transport.
          */
-        ipv6_addr_copy(&fl.fl6_dst, &transport->ipaddr_h.v6.sin6_addr);
+        ipv6_addr_copy(&fl.fl6_dst, &transport->ipaddr.v6.sin6_addr);
         ipv6_addr_copy(&fl.fl6_src, &transport->saddr.v6.sin6_addr);
 
         fl.fl6_flowlabel = np->flow_label;
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index a11bd4ff9303..c512ce491834 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -441,8 +441,8 @@ static void sctp_do_8_2_transport_strike(struct sctp_association *asoc,
                 SCTP_DEBUG_PRINTK_IPADDR("transport_strike:association %p",
                                          " transport IP: port:%d failed.\n",
                                          asoc,
-                                         (&transport->ipaddr_h),
-                                         transport->ipaddr_h.v4.sin_port);
+                                         (&transport->ipaddr),
+                                         ntohs(transport->ipaddr.v4.sin_port));
                 sctp_assoc_control_transport(asoc, transport,
                                              SCTP_TRANSPORT_DOWN,
                                              SCTP_FAILED_THRESHOLD);
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index d049b2ce5cf2..e527267a0536 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -3752,10 +3752,9 @@ static int sctp_getsockopt_peer_addrs_old(struct sock *sk, int len,
         to = (void __user *)getaddrs.addrs;
         list_for_each(pos, &asoc->peer.transport_addr_list) {
                 from = list_entry(pos, struct sctp_transport, transports);
-                memcpy(&temp, &from->ipaddr_h, sizeof(temp));
+                memcpy(&temp, &from->ipaddr, sizeof(temp));
                 sctp_get_pf_specific(sk->sk_family)->addr_v4map(sp, &temp);
                 addrlen = sctp_get_af_specific(sk->sk_family)->sockaddr_len;
-                temp.v4.sin_port = htons(temp.v4.sin_port);
                 if (copy_to_user(to, &temp, addrlen))
                         return -EFAULT;
                 to += addrlen ;
@@ -3801,12 +3800,11 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
 
         list_for_each(pos, &asoc->peer.transport_addr_list) {
                 from = list_entry(pos, struct sctp_transport, transports);
-                memcpy(&temp, &from->ipaddr_h, sizeof(temp));
+                memcpy(&temp, &from->ipaddr, sizeof(temp));
                 sctp_get_pf_specific(sk->sk_family)->addr_v4map(sp, &temp);
                 addrlen = sctp_get_af_specific(sk->sk_family)->sockaddr_len;
                 if(space_left < addrlen)
                         return -ENOMEM;
-                temp.v4.sin_port = htons(temp.v4.sin_port);
                 if (copy_to_user(to, &temp, addrlen))
                         return -EFAULT;
                 to += addrlen;