]> err.no Git - linux-2.6/commitdiff
[SCTP]: sctp_make_asconf_update_ip() and sctp_find_unmatch_addr().
authorAl Viro <viro@zeniv.linux.org.uk>
Tue, 21 Nov 2006 01:22:08 +0000 (17:22 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Sun, 3 Dec 2006 05:26:59 +0000 (21:26 -0800)
... switched to taking and returning pointers to net-endian
sctp_addr resp.  Together, since the only user of sctp_find_unmatch_addr()
just passes its value to sctp_make_asconf_update_ip().
sctp_make_asconf_update_ip() is actually endian-agnostic.

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

index f201df66180d0842a231a0b2a567ed549dd587ae..d6664dd30e564b2e946e0107255ebd597f62ac60 100644 (file)
@@ -345,7 +345,7 @@ union sctp_addr *sctp_find_unmatch_addr(struct sctp_bind_addr       *bp,
                        addr_buf += af->sockaddr_len;
                }
                if (i == addrcnt)
-                       return &laddr->a_h;
+                       return &laddr->a;
        }
 
        return NULL;
index a3e1ca2c3cb7405c4e2f6e086e80dfad4326cb57..d049b2ce5cf22493c5120754d4e0bcd57decbdd4 100644 (file)
@@ -547,7 +547,7 @@ static int sctp_send_asconf_add_ip(struct sock              *sk,
                laddr = list_entry(p, struct sctp_sockaddr_entry, list);
                sctp_read_unlock(&asoc->base.addr_lock);
 
-               chunk = sctp_make_asconf_update_ip(asoc, &laddr->a_h, addrs,
+               chunk = sctp_make_asconf_update_ip(asoc, &laddr->a, addrs,
                                                   addrcnt, SCTP_PARAM_ADD_IP);
                if (!chunk) {
                        retval = -ENOMEM;