drivers/net: use __packed annotation

[pandora-kernel.git] / drivers / net / wan / sdla.c

diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 43ae6f4..f4125da 100644 (file)
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -330,7 +330,7 @@ struct _dlci_stat
 {
        short dlci;
        char  flags;
-} __attribute__((packed));
+} __packed;
 
 struct _frad_stat 
 {
@@ -1211,14 +1211,9 @@ static int sdla_xfer(struct net_device *dev, struct sdla_mem __user *info, int r
        }
        else
        {
-               temp = kmalloc(mem.len, GFP_KERNEL);
-               if (!temp)
-                       return(-ENOMEM);
-               if(copy_from_user(temp, mem.data, mem.len))
-               {
-                       kfree(temp);
-                       return -EFAULT;
-               }
+               temp = memdup_user(mem.data, mem.len);
+               if (IS_ERR(temp))
+                       return PTR_ERR(temp);
                sdla_write(dev, mem.addr, temp, mem.len);
                kfree(temp);
        }