diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 20:36:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 20:36:45 -0400 |
| commit | 817b33d38f81c8736d39283c35c886ae4668f1af (patch) | |
| tree | 64f60a88baf8b48c350d680f8b69fa6c759c3a82 /include/net/sctp/structs.h | |
| parent | 84d88d5d4efc37dfb8a93a4a58d8a227ee86ffa4 (diff) | |
| parent | 8c185ab6185bf5e67766edb000ce428269364c86 (diff) | |
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 '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 { | |||
| 544 | int level, | 544 | int level, |
| 545 | int optname, | 545 | int optname, |
| 546 | char __user *optval, | 546 | char __user *optval, |
| 547 | int optlen); | 547 | unsigned int optlen); |
| 548 | int (*getsockopt) (struct sock *sk, | 548 | int (*getsockopt) (struct sock *sk, |
| 549 | int level, | 549 | int level, |
| 550 | int optname, | 550 | int optname, |
| @@ -554,7 +554,7 @@ struct sctp_af { | |||
| 554 | int level, | 554 | int level, |
| 555 | int optname, | 555 | int optname, |
| 556 | char __user *optval, | 556 | char __user *optval, |
| 557 | int optlen); | 557 | unsigned int optlen); |
| 558 | int (*compat_getsockopt) (struct sock *sk, | 558 | int (*compat_getsockopt) (struct sock *sk, |
| 559 | int level, | 559 | int level, |
| 560 | int optname, | 560 | int optname, |