compat_ioctl: move PPPIOCSCOMPRESS to ppp_generic

[sfrench/cifs-2.6.git] / fs / compat_ioctl.c

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index eda41b2537f03352226883918fb93fcf87ffea2b..0b5a732d7afd5395919559c9775d0c683a908c1f 100644 (file)
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -99,13 +99,6 @@ static int sg_grt_trans(struct file *file,
 }
 #endif /* CONFIG_BLOCK */
 
-struct ppp_option_data32 {
-       compat_caddr_t  ptr;
-       u32                     length;
-       compat_int_t            transmit;
-};
-#define PPPIOCSCOMPRESS32      _IOW('t', 77, struct ppp_option_data32)
-
 struct ppp_idle32 {
        compat_time_t xmit_idle;
        compat_time_t recv_idle;
@@ -133,29 +126,6 @@ static int ppp_gidle(struct file *file, unsigned int cmd,
        return err;
 }
 
-static int ppp_scompress(struct file *file, unsigned int cmd,
-       struct ppp_option_data32 __user *odata32)
-{
-       struct ppp_option_data __user *odata;
-       __u32 data;
-       void __user *datap;
-
-       odata = compat_alloc_user_space(sizeof(*odata));
-
-       if (get_user(data, &odata32->ptr))
-               return -EFAULT;
-
-       datap = compat_ptr(data);
-       if (put_user(datap, &odata->ptr))
-               return -EFAULT;
-
-       if (copy_in_user(&odata->length, &odata32->length,
-                        sizeof(__u32) + sizeof(int)))
-               return -EFAULT;
-
-       return do_ioctl(file, PPPIOCSCOMPRESS, (unsigned long) odata);
-}
-
 /*
  * simple reversible transform to make our table more evenly
  * distributed after sorting.
@@ -249,8 +219,6 @@ static long do_ioctl_trans(unsigned int cmd,
        switch (cmd) {
        case PPPIOCGIDLE32:
                return ppp_gidle(file, cmd, argp);
-       case PPPIOCSCOMPRESS32:
-               return ppp_scompress(file, cmd, argp);
 #ifdef CONFIG_BLOCK
        case SG_GET_REQUEST_TABLE:
                return sg_grt_trans(file, cmd, argp);