diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 17:36:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 17:36:45 -0700 |
commit | 817b33d38f81c8736d39283c35c886ae4668f1af (patch) | |
tree | 64f60a88baf8b48c350d680f8b69fa6c759c3a82 /net/atm/common.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 'net/atm/common.h')
-rw-r--r-- | net/atm/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/atm/common.h b/net/atm/common.h index 92e2981f479..f48a76b6cdf 100644 --- a/net/atm/common.h +++ b/net/atm/common.h @@ -21,7 +21,7 @@ unsigned int vcc_poll(struct file *file, struct socket *sock, poll_table *wait); int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); int vcc_setsockopt(struct socket *sock, int level, int optname, - char __user *optval, int optlen); + char __user *optval, unsigned int optlen); int vcc_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen); |