diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-01 04:36:45 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-01 04:36:45 +0400 |
| commit | 817b33d38f81c8736d39283c35c886ae4668f1af (patch) | |
| tree | 64f60a88baf8b48c350d680f8b69fa6c759c3a82 /net/ieee802154/dgram.c | |
| parent | 84d88d5d4efc37dfb8a93a4a58d8a227ee86ffa4 (diff) | |
| parent | 8c185ab6185bf5e67766edb000ce428269364c86 (diff) | |
| download | linux-817b33d38f81c8736d39283c35c886ae4668f1af.tar.xz | |
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/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; |