diff options
author | Adrian Bunk <bunk@stusta.de> | 2007-02-14 14:00:41 +0100 |
---|---|---|
committer | Adrian Bunk <bunk@stusta.de> | 2007-02-14 14:00:41 +0100 |
commit | e262fa806cb2da525fd9da2b6e534368e1219544 (patch) | |
tree | cbf2611913291b2e05a7db5bdf0c8f466f405e07 /net/bluetooth/cmtp | |
parent | 2f6d2c9b7d870de96a915748178aa02596ac19c1 (diff) |
Revert "[Bluetooth] Fix compat ioctl for BNEP, CMTP and HIDP"
This reverts commit ac4d63dab8bb425f1ae037abf349090c12f16883.
Does not work in 2.6.16.
Diffstat (limited to 'net/bluetooth/cmtp')
-rw-r--r-- | net/bluetooth/cmtp/sock.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c index d29e870bb379..3dc4851f5fb6 100644 --- a/net/bluetooth/cmtp/sock.c +++ b/net/bluetooth/cmtp/sock.c @@ -35,7 +35,6 @@ #include <linux/socket.h> #include <linux/ioctl.h> #include <linux/file.h> -#include <linux/compat.h> #include <net/sock.h> #include <linux/isdn/capilli.h> @@ -139,43 +138,11 @@ static int cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long return -EINVAL; } -#ifdef CONFIG_COMPAT -static int cmtp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) -{ - if (cmd == CMTPGETCONNLIST) { - struct cmtp_connlist_req cl; - uint32_t uci; - int err; - - if (get_user(cl.cnum, (uint32_t __user *) arg) || - get_user(uci, (u32 __user *) (arg + 4))) - return -EFAULT; - - cl.ci = compat_ptr(uci); - - if (cl.cnum <= 0) - return -EINVAL; - - err = cmtp_get_connlist(&cl); - - if (!err && put_user(cl.cnum, (uint32_t __user *) arg)) - err = -EFAULT; - - return err; - } - - return cmtp_sock_ioctl(sock, cmd, arg); -} -#endif - static const struct proto_ops cmtp_sock_ops = { .family = PF_BLUETOOTH, .owner = THIS_MODULE, .release = cmtp_sock_release, .ioctl = cmtp_sock_ioctl, -#ifdef CONFIG_COMPAT - .compat_ioctl = cmtp_sock_compat_ioctl, -#endif .bind = sock_no_bind, .getname = sock_no_getname, .sendmsg = sock_no_sendmsg, |