]> err.no Git - linux-2.6/commitdiff
[SCTP]: sctp_assoc_del_peer() switched to net-endian.
authorAl Viro <viro@zeniv.linux.org.uk>
Tue, 21 Nov 2006 01:06:45 +0000 (17:06 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Sun, 3 Dec 2006 05:26:36 +0000 (21:26 -0800)
Callers 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/sm_make_chunk.c
net/sctp/sm_sideeffect.c

index 22c2519d3fd84e7bc32dde22c4e9bb6c5f38a0bb..ab3141f05921ab032630cb83c19b61cd597fa531 100644 (file)
@@ -666,13 +666,10 @@ void sctp_assoc_del_peer(struct sctp_association *asoc,
        struct list_head        *pos;
        struct list_head        *temp;
        struct sctp_transport   *transport;
-       union sctp_addr tmp;
-
-       flip_to_n(&tmp, addr);
 
        list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) {
                transport = list_entry(pos, struct sctp_transport, transports);
-               if (sctp_cmp_addr_exact(&tmp, &transport->ipaddr)) {
+               if (sctp_cmp_addr_exact(addr, &transport->ipaddr)) {
                        /* Do book keeping for removing the peer and free it. */
                        sctp_assoc_rm_peer(asoc, transport);
                        break;
@@ -1051,7 +1048,7 @@ void sctp_assoc_update(struct sctp_association *asoc,
        list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) {
                trans = list_entry(pos, struct sctp_transport, transports);
                if (!sctp_assoc_lookup_paddr(new, &trans->ipaddr_h))
-                       sctp_assoc_del_peer(asoc, &trans->ipaddr_h);
+                       sctp_assoc_del_peer(asoc, &trans->ipaddr);
        }
 
        /* If the case is A (association restart), use
index ee907ea7eed109ded5fbc00292f3cdd936cca781..303830b40ab30db103aaf8b49bcf42370ae8242c 100644 (file)
@@ -2463,7 +2463,7 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc,
                if (sctp_cmp_addr_exact(&tmp, &tmp_addr))
                        return SCTP_ERROR_DEL_SRC_IP;
 
-               sctp_assoc_del_peer(asoc, &addr);
+               sctp_assoc_del_peer(asoc, &tmp_addr);
                break;
        case SCTP_PARAM_SET_PRIMARY:
                peer = sctp_assoc_lookup_paddr(asoc, &addr);
index 50d4ccc15ad1fbe03fc7adccf5918602517e057a..a11bd4ff93031f2785da55c1376afa5040b74181 100644 (file)
@@ -835,7 +835,7 @@ static void sctp_cmd_del_non_primary(struct sctp_association *asoc)
                t = list_entry(pos, struct sctp_transport, transports);
                if (!sctp_cmp_addr_exact(&t->ipaddr,
                                         &asoc->peer.primary_addr)) {
-                       sctp_assoc_del_peer(asoc, &t->ipaddr_h);
+                       sctp_assoc_del_peer(asoc, &t->ipaddr);
                }
        }