From aaef67ca10ac4e37b0a79c820308bfb8ba4f3fbc Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Mon, 1 Feb 2010 09:44:19 +0000 Subject: [PATCH] --- yaml --- r: 183828 b: refs/heads/master c: 1621e0940294c20e302faf401f41204de7252e22 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/net.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8e6870143b10..fff1b29db09b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf66f3736a945dd4e92d86427276c6eeab0a6c1d +refs/heads/master: 1621e0940294c20e302faf401f41204de7252e22 diff --git a/trunk/include/linux/net.h b/trunk/include/linux/net.h index 5e8083cacc8b..4157b5d42bd6 100644 --- a/trunk/include/linux/net.h +++ b/trunk/include/linux/net.h @@ -174,18 +174,22 @@ struct proto_ops { struct poll_table_struct *wait); int (*ioctl) (struct socket *sock, unsigned int cmd, unsigned long arg); +#ifdef CONFIG_COMPAT int (*compat_ioctl) (struct socket *sock, unsigned int cmd, unsigned long arg); +#endif int (*listen) (struct socket *sock, int len); int (*shutdown) (struct socket *sock, int flags); int (*setsockopt)(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen); int (*getsockopt)(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen); +#ifdef CONFIG_COMPAT int (*compat_setsockopt)(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen); int (*compat_getsockopt)(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen); +#endif int (*sendmsg) (struct kiocb *iocb, struct socket *sock, struct msghdr *m, size_t total_len); int (*recvmsg) (struct kiocb *iocb, struct socket *sock,