aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-20 20:22:08 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:26:59 -0500
commit5ae955cffdb96190c2bd4f57313f5f147f87854b (patch)
treea5ce00b2f9cfb858d88c7b9a75747bea698aa8f9
parent6244be4e063075f6077f05e70f8fa1bf7f4a968e (diff)
[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 f201df66180d..d6664dd30e56 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,
345 addr_buf += af->sockaddr_len; 345 addr_buf += af->sockaddr_len;
346 } 346 }
347 if (i == addrcnt) 347 if (i == addrcnt)
348 return &laddr->a_h; 348 return &laddr->a;
349 } 349 }
350 350
351 return NULL; 351 return NULL;
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index a3e1ca2c3cb7..d049b2ce5cf2 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,
547 laddr = list_entry(p, struct sctp_sockaddr_entry, list); 547 laddr = list_entry(p, struct sctp_sockaddr_entry, list);
548 sctp_read_unlock(&asoc->base.addr_lock); 548 sctp_read_unlock(&asoc->base.addr_lock);
549 549
550 chunk = sctp_make_asconf_update_ip(asoc, &laddr->a_h, addrs, 550 chunk = sctp_make_asconf_update_ip(asoc, &laddr->a, addrs,
551 addrcnt, SCTP_PARAM_ADD_IP); 551 addrcnt, SCTP_PARAM_ADD_IP);
552 if (!chunk) { 552 if (!chunk) {
553 retval = -ENOMEM; 553 retval = -ENOMEM;