diff options
author | James Morris <jmorris@macbook.(none)> | 2009-12-03 07:33:40 +0100 |
---|---|---|
committer | James Morris <jmorris@macbook.(none)> | 2009-12-03 07:33:40 +0100 |
commit | c84d6efd363a3948eb32ec40d46bab6338580454 (patch) | |
tree | 3ba7ac46e6626fe8ac843834588609eb6ccee5c6 /net/ieee802154/raw.c | |
parent | TOMOYO: Add recursive directory matching operator support. (diff) | |
parent | Linux 2.6.32 (diff) | |
download | linux-c84d6efd363a3948eb32ec40d46bab6338580454.tar.xz linux-c84d6efd363a3948eb32ec40d46bab6338580454.zip |
Merge branch 'master' into next
Diffstat (limited to 'net/ieee802154/raw.c')
-rw-r--r-- | net/ieee802154/raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c index 13198859982e..30e74eee07d6 100644 --- a/net/ieee802154/raw.c +++ b/net/ieee802154/raw.c @@ -244,7 +244,7 @@ static int raw_getsockopt(struct sock *sk, int level, int optname, } static int raw_setsockopt(struct sock *sk, int level, int optname, - char __user *optval, int optlen) + char __user *optval, unsigned int optlen) { return -EOPNOTSUPP; } |