diff options
| author | J. Bruce Fields | 2009-10-27 23:45:17 +0100 |
|---|---|---|
| committer | J. Bruce Fields | 2009-10-27 23:45:17 +0100 |
| commit | e343eb0d60f74547e0aeb5bd151105c2e6cfe588 (patch) | |
| tree | 92586df0daf3298262a957640e5c86679c963f41 /include/net/sctp/structs.h | |
| parent | nfsd41: use sv_max_mesg for forechannel max sizes (diff) | |
| parent | Linux 2.6.32-rc5 (diff) | |
| download | kernel-qcow2-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.tar.gz kernel-qcow2-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.tar.xz kernel-qcow2-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.zip | |
Merge commit 'v2.6.32-rc5' into for-2.6.33
Diffstat (limited to 'include/net/sctp/structs.h')
| -rw-r--r-- | include/net/sctp/structs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 42d00ced5eb8..6e5f0e0c7967 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h @@ -544,7 +544,7 @@ struct sctp_af { int level, int optname, char __user *optval, - int optlen); + unsigned int optlen); int (*getsockopt) (struct sock *sk, int level, int optname, @@ -554,7 +554,7 @@ struct sctp_af { int level, int optname, char __user *optval, - int optlen); + unsigned int optlen); int (*compat_getsockopt) (struct sock *sk, int level, int optname, |