[NET]: allow 32 bit socket ioctl in 64 bit kernel

[deliverable/linux.git] / include / linux / net.h

diff --git a/include/linux/net.h b/include/linux/net.h
index 28195a2d8ff0a50501a5ab180ef6bf3b252cbb28..84a490e5f0a1234e68b0f83caf0e01b5f8d8812a 100644 (file)
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -143,12 +143,18 @@ struct proto_ops {
                                      struct poll_table_struct *wait);
        int             (*ioctl)     (struct socket *sock, unsigned int cmd,
                                      unsigned long arg);
+       int             (*compat_ioctl) (struct socket *sock, unsigned int cmd,
+                                     unsigned long arg);
        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, int optlen);
        int             (*getsockopt)(struct socket *sock, int level,
                                      int optname, char __user *optval, int __user *optlen);
+       int             (*compat_setsockopt)(struct socket *sock, int level,
+                                     int optname, char __user *optval, int optlen);
+       int             (*compat_getsockopt)(struct socket *sock, int level,
+                                     int optname, char __user *optval, int __user *optlen);
        int             (*sendmsg)   (struct kiocb *iocb, struct socket *sock,
                                      struct msghdr *m, size_t total_len);
        int             (*recvmsg)   (struct kiocb *iocb, struct socket *sock,
@@ -247,6 +253,8 @@ SOCKCALL_UWRAP(name, poll, (struct file *file, struct socket *sock, struct poll_
              (file, sock, wait)) \
 SOCKCALL_WRAP(name, ioctl, (struct socket *sock, unsigned int cmd, \
                         unsigned long arg), (sock, cmd, arg)) \
+SOCKCALL_WRAP(name, compat_ioctl, (struct socket *sock, unsigned int cmd, \
+                        unsigned long arg), (sock, cmd, arg)) \
 SOCKCALL_WRAP(name, listen, (struct socket *sock, int len), (sock, len)) \
 SOCKCALL_WRAP(name, shutdown, (struct socket *sock, int flags), (sock, flags)) \
 SOCKCALL_WRAP(name, setsockopt, (struct socket *sock, int level, int optname, \
@@ -271,6 +279,7 @@ static const struct proto_ops name##_ops = {                        \
        .getname        = __lock_##name##_getname,      \
        .poll           = __lock_##name##_poll,         \
        .ioctl          = __lock_##name##_ioctl,        \
+       .compat_ioctl   = __lock_##name##_compat_ioctl, \
        .listen         = __lock_##name##_listen,       \
        .shutdown       = __lock_##name##_shutdown,     \
        .setsockopt     = __lock_##name##_setsockopt,   \
@@ -279,6 +288,7 @@ static const struct proto_ops name##_ops = {                        \
        .recvmsg        = __lock_##name##_recvmsg,      \
        .mmap           = __lock_##name##_mmap,         \
 };
+
 #endif
 
 #define MODULE_ALIAS_NETPROTO(proto) \