diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 20:36:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 20:36:45 -0400 |
| commit | 817b33d38f81c8736d39283c35c886ae4668f1af (patch) | |
| tree | 64f60a88baf8b48c350d680f8b69fa6c759c3a82 /include/net/inet_connection_sock.h | |
| parent | 84d88d5d4efc37dfb8a93a4a58d8a227ee86ffa4 (diff) | |
| parent | 8c185ab6185bf5e67766edb000ce428269364c86 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ax25: Fix possible oops in ax25_make_new
net: restore tx timestamping for accelerated vlans
Phonet: fix mutex imbalance
sit: fix off-by-one in ipip6_tunnel_get_prl
net: Fix sock_wfree() race
net: Make setsockopt() optlen be unsigned.
Diffstat (limited to 'include/net/inet_connection_sock.h')
| -rw-r--r-- | include/net/inet_connection_sock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h index 03cffd9f64e3..696d6e4ce68a 100644 --- a/include/net/inet_connection_sock.h +++ b/include/net/inet_connection_sock.h | |||
| @@ -48,13 +48,13 @@ struct inet_connection_sock_af_ops { | |||
| 48 | u16 net_header_len; | 48 | u16 net_header_len; |
| 49 | u16 sockaddr_len; | 49 | u16 sockaddr_len; |
| 50 | int (*setsockopt)(struct sock *sk, int level, int optname, | 50 | int (*setsockopt)(struct sock *sk, int level, int optname, |
| 51 | char __user *optval, int optlen); | 51 | char __user *optval, unsigned int optlen); |
| 52 | int (*getsockopt)(struct sock *sk, int level, int optname, | 52 | int (*getsockopt)(struct sock *sk, int level, int optname, |
| 53 | char __user *optval, int __user *optlen); | 53 | char __user *optval, int __user *optlen); |
| 54 | #ifdef CONFIG_COMPAT | 54 | #ifdef CONFIG_COMPAT |
| 55 | int (*compat_setsockopt)(struct sock *sk, | 55 | int (*compat_setsockopt)(struct sock *sk, |
| 56 | int level, int optname, | 56 | int level, int optname, |
| 57 | char __user *optval, int optlen); | 57 | char __user *optval, unsigned int optlen); |
| 58 | int (*compat_getsockopt)(struct sock *sk, | 58 | int (*compat_getsockopt)(struct sock *sk, |
| 59 | int level, int optname, | 59 | int level, int optname, |
| 60 | char __user *optval, int __user *optlen); | 60 | char __user *optval, int __user *optlen); |
| @@ -332,5 +332,5 @@ extern void inet_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr); | |||
| 332 | extern int inet_csk_compat_getsockopt(struct sock *sk, int level, int optname, | 332 | extern int inet_csk_compat_getsockopt(struct sock *sk, int level, int optname, |
| 333 | char __user *optval, int __user *optlen); | 333 | char __user *optval, int __user *optlen); |
| 334 | extern int inet_csk_compat_setsockopt(struct sock *sk, int level, int optname, | 334 | extern int inet_csk_compat_setsockopt(struct sock *sk, int level, int optname, |
| 335 | char __user *optval, int optlen); | 335 | char __user *optval, unsigned int optlen); |
| 336 | #endif /* _INET_CONNECTION_SOCK_H */ | 336 | #endif /* _INET_CONNECTION_SOCK_H */ |