diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 09:30:10 +0200 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 09:30:10 +0200 |
commit | 5d13379a4dba717fb75b749acc0f928c2c02db17 (patch) | |
tree | ab5bf870206e6ea8e744390cdb37cb14f7e78257 /net/ieee802154/dgram.c | |
parent | 08dc8726d4be85bca793141c827574fd32a681bb (diff) | |
parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
download | linux-stable-5d13379a4dba717fb75b749acc0f928c2c02db17.tar.gz linux-stable-5d13379a4dba717fb75b749acc0f928c2c02db17.tar.bz2 linux-stable-5d13379a4dba717fb75b749acc0f928c2c02db17.zip |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'net/ieee802154/dgram.c')
-rw-r--r-- | net/ieee802154/dgram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c index 51593a48f2dd..a413b1bf4465 100644 --- a/net/ieee802154/dgram.c +++ b/net/ieee802154/dgram.c @@ -414,7 +414,7 @@ static int dgram_getsockopt(struct sock *sk, int level, int optname, } static int dgram_setsockopt(struct sock *sk, int level, int optname, - char __user *optval, int optlen) + char __user *optval, unsigned int optlen) { struct dgram_sock *ro = dgram_sk(sk); int val; |