mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 16:41:58 +00:00
cee4cca740
* git://git.infradead.org/hdrcleanup-2.6: (63 commits) [S390] __FD_foo definitions. Switch to __s32 types in joystick.h instead of C99 types for consistency. Add <sys/types.h> to headers included for userspace in <linux/input.h> Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h Remove struct fddi_statistics from user view in <linux/if_fddi.h> Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390 Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h> Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too Remove private struct dx_hash_info from public view in <linux/ext3_fs.h> Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h> Use __uXX types in <linux/divert.h> for struct divert_blk et al. Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible. Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely Use __uXX types in user-visible structures in <linux/nbd.h> Don't use 'u32' in user-visible struct ip_conntrack_old_tuple. Use __uXX types for S390 DASD volume label definitions which are user-visible S390 BIODASDREADCMB ioctl should use __u64 not u64 type. Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h> Fix private integer types used in V4L2 ioctls. ... Manually resolve conflict in include/linux/mtd/physmap.h
43 lines
1.3 KiB
C
43 lines
1.3 KiB
C
#ifndef NET_COMPAT_H
|
|
#define NET_COMPAT_H
|
|
|
|
|
|
struct sock;
|
|
|
|
#if defined(CONFIG_COMPAT)
|
|
|
|
#include <linux/compat.h>
|
|
|
|
struct compat_msghdr {
|
|
compat_uptr_t msg_name; /* void * */
|
|
compat_int_t msg_namelen;
|
|
compat_uptr_t msg_iov; /* struct compat_iovec * */
|
|
compat_size_t msg_iovlen;
|
|
compat_uptr_t msg_control; /* void * */
|
|
compat_size_t msg_controllen;
|
|
compat_uint_t msg_flags;
|
|
};
|
|
|
|
struct compat_cmsghdr {
|
|
compat_size_t cmsg_len;
|
|
compat_int_t cmsg_level;
|
|
compat_int_t cmsg_type;
|
|
};
|
|
|
|
extern int compat_sock_get_timestamp(struct sock *, struct timeval __user *);
|
|
|
|
#else /* defined(CONFIG_COMPAT) */
|
|
#define compat_msghdr msghdr /* to avoid compiler warnings */
|
|
#endif /* defined(CONFIG_COMPAT) */
|
|
|
|
extern int get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *);
|
|
extern int verify_compat_iovec(struct msghdr *, struct iovec *, char *, int);
|
|
extern asmlinkage long compat_sys_sendmsg(int,struct compat_msghdr __user *,unsigned);
|
|
extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsigned);
|
|
extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user *, int __user *);
|
|
extern int put_cmsg_compat(struct msghdr*, int, int, int, void *);
|
|
|
|
extern int cmsghdr_from_user_compat_to_kern(struct msghdr *, struct sock *, unsigned char *, int);
|
|
|
|
#endif /* NET_COMPAT_H */
|