diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
| commit | aaadff81195056c7c14e0d834b3318c624c0fd78 (patch) | |
| tree | 34d66d8dcb25fa9ffb568f8acfdb317ddf203b44 /net/sctp/socket.c | |
| parent | c6329f4df2263ab5a40601a5236639e61b682f51 (diff) | |
| parent | df7addbb45874f0f992266003155de5a22e1872f (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; |