diff --git a/[refs] b/[refs] index 3d24e8ad0468..052ada3146ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6244be4e063075f6077f05e70f8fa1bf7f4a968e +refs/heads/master: 5ae955cffdb96190c2bd4f57313f5f147f87854b diff --git a/trunk/net/sctp/bind_addr.c b/trunk/net/sctp/bind_addr.c index f201df66180d..d6664dd30e56 100644 --- a/trunk/net/sctp/bind_addr.c +++ b/trunk/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/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c index a3e1ca2c3cb7..d049b2ce5cf2 100644 --- a/trunk/net/sctp/socket.c +++ b/trunk/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;