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

1 files changed, 22 insertions, 2 deletions

diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 27945049c9e1..80d5c5834a0b 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -33,6 +33,8 @@
 #include <linux/lapb.h>
 #include <linux/init.h>
 #include <linux/rtnetlink.h>
+#include <linux/compat.h>
+#include <linux/slab.h>
 #include "x25_asy.h"
 
 #include <net/x25device.h>
@@ -656,8 +658,8 @@ static void x25_asy_unesc(struct x25_asy *sl, unsigned char s)
 
         switch (s) {
         case X25_END:
-                if (!test_and_clear_bit(SLF_ERROR, &sl->flags)
-                        && sl->rcount > 2)
+                if (!test_and_clear_bit(SLF_ERROR, &sl->flags) &&
+                    sl->rcount > 2)
                         x25_asy_bump(sl);
                 clear_bit(SLF_ESCAPE, &sl->flags);
                 sl->rcount = 0;
@@ -705,6 +707,21 @@ static int x25_asy_ioctl(struct tty_struct *tty, struct file *file,
         }
 }
 
+#ifdef CONFIG_COMPAT
+static long x25_asy_compat_ioctl(struct tty_struct *tty, struct file *file,
+                         unsigned int cmd,  unsigned long arg)
+{
+        switch (cmd) {
+        case SIOCGIFNAME:
+        case SIOCSIFHWADDR:
+                return x25_asy_ioctl(tty, file, cmd,
+                                     (unsigned long)compat_ptr(arg));
+        }
+
+        return -ENOIOCTLCMD;
+}
+#endif
+
 static int x25_asy_open_dev(struct net_device *dev)
 {
         struct x25_asy *sl = netdev_priv(dev);
@@ -754,6 +771,9 @@ static struct tty_ldisc_ops x25_ldisc = {
         .open           = x25_asy_open_tty,
         .close          = x25_asy_close_tty,
         .ioctl          = x25_asy_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl   = x25_asy_compat_ioctl,
+#endif
         .receive_buf    = x25_asy_receive_buf,
         .write_wakeup   = x25_asy_write_wakeup,
 };