]> err.no Git - linux-2.6/commitdiff
[SCTP]: Switch ->primary_addr to net-endian.
authorAl Viro <viro@zeniv.linux.org.uk>
Tue, 21 Nov 2006 01:06:04 +0000 (17:06 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Sun, 3 Dec 2006 05:26:34 +0000 (21:26 -0800)
Users adjusted.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/associola.c
net/sctp/proc.c
net/sctp/sm_sideeffect.c

index 8d841f16dcbd2ad899551be93f147eee42ed5301..22c2519d3fd84e7bc32dde22c4e9bb6c5f38a0bb 100644 (file)
@@ -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
index 04faa4a706d42de62cc5605840ad7fee78c79101..b3493bdbcacbc884cabedc055c3cd82f5097850e 100644 (file)
@@ -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);
index 3d9213dfaa10f7a052c47d75aa2250961c95eaa6..50d4ccc15ad1fbe03fc7adccf5918602517e057a 100644 (file)
@@ -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);
                }
        }