Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 30 insertions, 4 deletions

diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index fe3cebb984de..89696156c059 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -80,8 +80,10 @@
 #include <linux/rtnetlink.h>
 #include <linux/if_arp.h>
 #include <linux/if_slip.h>
+#include <linux/compat.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include "slip.h"
 #ifdef CONFIG_INET
 #include <linux/ip.h>
@@ -955,8 +957,8 @@ static void slip_unesc(struct slip *sl, unsigned char s)
                         clear_bit(SLF_KEEPTEST, &sl->flags);
 #endif
 
-                if (!test_and_clear_bit(SLF_ERROR, &sl->flags)
-                                                        && (sl->rcount > 2))
+                if (!test_and_clear_bit(SLF_ERROR, &sl->flags) &&
+                    (sl->rcount > 2))
                         sl_bump(sl);
                 clear_bit(SLF_ESCAPE, &sl->flags);
                 sl->rcount = 0;
@@ -1038,8 +1040,8 @@ static void slip_unesc6(struct slip *sl, unsigned char s)
                         clear_bit(SLF_KEEPTEST, &sl->flags);
 #endif
 
-                if (!test_and_clear_bit(SLF_ERROR, &sl->flags)
-                                                        && (sl->rcount > 2))
+                if (!test_and_clear_bit(SLF_ERROR, &sl->flags) &&
+                    (sl->rcount > 2))
                         sl_bump(sl);
                 sl->rcount = 0;
                 sl->xbits = 0;
@@ -1169,6 +1171,27 @@ static int slip_ioctl(struct tty_struct *tty, struct file *file,
         }
 }
 
+#ifdef CONFIG_COMPAT
+static long slip_compat_ioctl(struct tty_struct *tty, struct file *file,
+                                        unsigned int cmd, unsigned long arg)
+{
+        switch (cmd) {
+        case SIOCGIFNAME:
+        case SIOCGIFENCAP:
+        case SIOCSIFENCAP:
+        case SIOCSIFHWADDR:
+        case SIOCSKEEPALIVE:
+        case SIOCGKEEPALIVE:
+        case SIOCSOUTFILL:
+        case SIOCGOUTFILL:
+                return slip_ioctl(tty, file, cmd,
+                                  (unsigned long)compat_ptr(arg));
+        }
+
+        return -ENOIOCTLCMD;
+}
+#endif
+
 /* VSV changes start here */
 #ifdef CONFIG_SLIP_SMART
 /* function do_ioctl called from net/core/dev.c
@@ -1261,6 +1284,9 @@ static struct tty_ldisc_ops sl_ldisc = {
         .close          = slip_close,
         .hangup         = slip_hangup,
         .ioctl          = slip_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl   = slip_compat_ioctl,
+#endif
         .receive_buf    = slip_receive_buf,
         .write_wakeup   = slip_write_wakeup,
 };