diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
| commit | 418fbfe979d96efc7b91f29b2085d51541c61f0b (patch) | |
| tree | a9acb07328e0c76011727d5b3b6f5407afcd2866 /net/sctp/socket.c | |
| parent | 8b132f4ee7304fec4fa27dec67879bc0172e916a (diff) | |
| parent | ff60dde9e46b87757d5e83bd58be0688fca8e816 (diff) | |
Merge branch 'master'
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 d890dfa8818f..1f7f244806b7 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -3425,7 +3425,7 @@ static int sctp_copy_laddrs_to_user_old(struct sock *sk, __u16 port, int max_add | |||
| 3425 | } | 3425 | } |
| 3426 | 3426 | ||
| 3427 | static int sctp_copy_laddrs_to_user(struct sock *sk, __u16 port, | 3427 | static int sctp_copy_laddrs_to_user(struct sock *sk, __u16 port, |
| 3428 | void * __user *to, size_t space_left) | 3428 | void __user **to, size_t space_left) |
| 3429 | { | 3429 | { |
| 3430 | struct list_head *pos; | 3430 | struct list_head *pos; |
| 3431 | struct sctp_sockaddr_entry *addr; | 3431 | struct sctp_sockaddr_entry *addr; |