diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 12:44:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 12:44:11 -0400 |
| commit | 77a50df2b14c8d3ee3c58c21c4a0e0157570df09 (patch) | |
| tree | 0e324a712e5e768c8353b0b5ba6ddc31095479f0 /include/net | |
| parent | 96fffeb4b413a4f8f65bb627d59b7dfc97ea0b39 (diff) | |
| parent | 358c12953b88c5a06a57c33eb27c753b2e7934d1 (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:
iwlwifi: Allow building iwl3945 without iwl4965.
wireless: Fix compile error with wifi & leds
tcp: Fix slab corruption with ipv6 and tcp6fuzz
ipv4/ipv6 compat: Fix SSM applications on 64bit kernels.
[IPSEC]: Use digest_null directly for auth
sunrpc: fix missing kernel-doc
can: Fix copy_from_user() results interpretation
Revert "ipv6: Fix typo in net/ipv6/Kconfig"
tipc: endianness annotations
ipv6: result of csum_fold() is already 16bit, no need to cast
[XFRM] AUDIT: Fix flowlabel text format ambibuity.
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/compat.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/compat.h b/include/net/compat.h index 406db242f73a..05fa5d0254ab 100644 --- a/include/net/compat.h +++ b/include/net/compat.h | |||
| @@ -40,4 +40,7 @@ extern int put_cmsg_compat(struct msghdr*, int, int, int, void *); | |||
| 40 | 40 | ||
| 41 | extern int cmsghdr_from_user_compat_to_kern(struct msghdr *, struct sock *, unsigned char *, int); | 41 | extern int cmsghdr_from_user_compat_to_kern(struct msghdr *, struct sock *, unsigned char *, int); |
| 42 | 42 | ||
| 43 | extern int compat_mc_setsockopt(struct sock *, int, int, char __user *, int, | ||
| 44 | int (*)(struct sock *, int, int, char __user *, int)); | ||
| 45 | |||
| 43 | #endif /* NET_COMPAT_H */ | 46 | #endif /* NET_COMPAT_H */ |