diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-01 02:36:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-01 02:36:45 +0200 |
| commit | 817b33d38f81c8736d39283c35c886ae4668f1af (patch) | |
| tree | 64f60a88baf8b48c350d680f8b69fa6c759c3a82 /net/rds/af_rds.c | |
| parent | Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | ax25: Fix possible oops in ax25_make_new (diff) | |
| download | linux-817b33d38f81c8736d39283c35c886ae4668f1af.tar.xz linux-817b33d38f81c8736d39283c35c886ae4668f1af.zip | |
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/rds/af_rds.c')
| -rw-r--r-- | net/rds/af_rds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c index 6b58aeff4c7a..98e05382fd3c 100644 --- a/net/rds/af_rds.c +++ b/net/rds/af_rds.c @@ -248,7 +248,7 @@ static int rds_cong_monitor(struct rds_sock *rs, char __user *optval, } static int rds_setsockopt(struct socket *sock, int level, int optname, - char __user *optval, int optlen) + char __user *optval, unsigned int optlen) { struct rds_sock *rs = rds_sk_to_rs(sock->sk); int ret; |