diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-04 03:20:44 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-04 03:24:31 +0400 |
| commit | f5460618405eec8c3300947a499011528a115acd (patch) | |
| tree | 19aba5acb6d91d5a20400292aaf1881a6b26c118 /net/sctp/socket.c | |
| parent | 4f70ecca9c57731b4acbe5043eb22e4416bd2368 (diff) | |
| parent | 0e3aef8d09a8c11e3fb83cdcb24b5bc7421b3726 (diff) | |
| download | linux-f5460618405eec8c3300947a499011528a115acd.tar.xz | |
Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev
Add missing linux/vmalloc.h include to net/sctp/probe.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index bae764005d2d..ba1add0b13c3 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4384,7 +4384,7 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len, transports) { memcpy(&temp, &from->ipaddr, sizeof(temp)); sctp_get_pf_specific(sk->sk_family)->addr_v4map(sp, &temp); - addrlen = sctp_get_af_specific(sk->sk_family)->sockaddr_len; + addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len; if (space_left < addrlen) return -ENOMEM; if (copy_to_user(to, &temp, addrlen)) |