3 files changed, 4 insertions, 8 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 8d841f16dcb..22c2519d3fd 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -442,7 +442,7 @@ void sctp_assoc_set_primary(struct sctp_association *asoc,
         asoc->peer.primary_path = transport;
 
         /* Set a default msg_name for events. */
-        memcpy(&asoc->peer.primary_addr, &transport->ipaddr_h,
+        memcpy(&asoc->peer.primary_addr, &transport->ipaddr,
                sizeof(union sctp_addr));
 
         /* If the primary path is changing, assume that the
diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index 04faa4a706d..b3493bdbcac 100644
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -175,16 +175,14 @@ static void sctp_seq_dump_remote_addrs(struct seq_file *seq, struct sctp_associa
         struct list_head *pos;
         struct sctp_transport *transport;
         union sctp_addr *addr, *primary;
-        union sctp_addr tmp;
         struct sctp_af *af;
 
-        primary = &(assoc->peer.primary_addr);
-        flip_to_n(&tmp, primary);
+        primary = &assoc->peer.primary_addr;
         list_for_each(pos, &assoc->peer.transport_addr_list) {
                 transport = list_entry(pos, struct sctp_transport, transports);
                 addr = &transport->ipaddr;
                 af = sctp_get_af_specific(addr->sa.sa_family);
-                if (af->cmp_addr(addr, &tmp)) {
+                if (af->cmp_addr(addr, primary)) {
                         seq_printf(seq, "*");
                 }
                 af->seq_dump_addr(seq, addr);
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index 3d9213dfaa1..50d4ccc15ad 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -830,13 +830,11 @@ static void sctp_cmd_del_non_primary(struct sctp_association *asoc)
         struct sctp_transport *t;
         struct list_head *pos;
         struct list_head *temp;
-        union sctp_addr tmp;
-        flip_to_n(&tmp, &asoc->peer.primary_addr);
 
         list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) {
                 t = list_entry(pos, struct sctp_transport, transports);
                 if (!sctp_cmp_addr_exact(&t->ipaddr,
-                                         &tmp)) {
+                                         &asoc->peer.primary_addr)) {
                         sctp_assoc_del_peer(asoc, &t->ipaddr_h);
                 }
         }