summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-20 17:22:08 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-02 21:26:59 -0800
commit5ae955cffdb96190c2bd4f57313f5f147f87854b (patch)
treea5ce00b2f9cfb858d88c7b9a75747bea698aa8f9
parent6244be4e063075f6077f05e70f8fa1bf7f4a968e (diff)
downloadop-kernel-dev-5ae955cffdb96190c2bd4f57313f5f147f87854b.zip
op-kernel-dev-5ae955cffdb96190c2bd4f57313f5f147f87854b.tar.gz
[SCTP]: sctp_make_asconf_update_ip() and sctp_find_unmatch_addr().
... 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>
-rw-r--r--net/sctp/bind_addr.c2
-rw-r--r--net/sctp/socket.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c
index f201df6..d6664dd 100644
--- a/net/sctp/bind_addr.c
+++ b/net/sctp/bind_addr.c
@@ -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;
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index a3e1ca2..d049b2c 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -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;
OpenPOWER on IntegriCloud