Merge remote-tracking branch 'mkp-scsi/fixes' into fixes

[karo-tx-linux.git] / drivers / net / slip / slip.c

diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index 9ed6d1c1ee45f15b2686b7c4102045b3acead55c..9841f3dc068227ae93777eaca1ad30869d8670b1 100644 (file)
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -64,7 +64,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/bitops.h>
 #include <linux/sched.h>
 #include <linux/string.h>
@@ -561,12 +561,7 @@ static int sl_change_mtu(struct net_device *dev, int new_mtu)
 {
        struct slip *sl = netdev_priv(dev);
 
-       if (new_mtu < 68 || new_mtu > 65534)
-               return -EINVAL;
-
-       if (new_mtu != dev->mtu)
-               return sl_realloc_bufs(sl, new_mtu);
-       return 0;
+       return sl_realloc_bufs(sl, new_mtu);
 }
 
 /* Netdevice get statistics request */
@@ -663,6 +658,10 @@ static void sl_setup(struct net_device *dev)
        dev->addr_len           = 0;
        dev->tx_queue_len       = 10;
 
+       /* MTU range: 68 - 65534 */
+       dev->min_mtu = 68;
+       dev->max_mtu = 65534;
+
        /* New-style flags. */
        dev->flags              = IFF_NOARP|IFF_POINTOPOINT|IFF_MULTICAST;
 }