diff options
author | 2009-10-27 18:45:17 -0400 | |
---|---|---|
committer | 2009-10-27 18:45:17 -0400 | |
commit | e343eb0d60f74547e0aeb5bd151105c2e6cfe588 (patch) | |
tree | 92586df0daf3298262a957640e5c86679c963f41 /net/rose | |
parent | nfsd41: use sv_max_mesg for forechannel max sizes (diff) | |
parent | Linux 2.6.32-rc5 (diff) | |
download | linux-dev-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.tar.xz linux-dev-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.zip |
Merge commit 'v2.6.32-rc5' into for-2.6.33
Diffstat (limited to 'net/rose')
-rw-r--r-- | net/rose/af_rose.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 1e166c9685aa..502cce76621d 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -370,7 +370,7 @@ void rose_destroy_socket(struct sock *sk) */ static int rose_setsockopt(struct socket *sock, int level, int optname, - char __user *optval, int optlen) + char __user *optval, unsigned int optlen) { struct sock *sk = sock->sk; struct rose_sock *rose = rose_sk(sk); |