[2.6.22.y] {10/17} - via-velocity-dont-oops-on-mtu-change-1 - series for stable kernel

[2.6.22.y] {10/17} - via-velocity-dont-oops-on-mtu-change-1 - series for stable kernel

[Oliver Pinter (Pintér Olivér)]

[-- Attachment #1: Type: text/plain, Size: 19 bytes --]

-- 
Thanks,
Oliver

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: via-velocity-dont-oops-on-mtu-change-1 --]
[-- Type: text/x-diff; name=via-velocity-dont-oops-on-mtu-change-1, Size: 1015 bytes --]

commit cefe0b205bc46195bd3d727c3a64d1315eb348d1
Author: Stephen Hemminger <shemminger@linux-foundation.org>
Date:   Thu Nov 15 03:47:27 2007 -0800

    Subject: [VIA_VELOCITY]: Don't oops on MTU change.
    Patch-mainline: v2.6.24-rc3
    References: 341537
    
    [VIA_VELOCITY]: Don't oops on MTU change.
    
    Simple mtu change when device is down.
    Fix http://bugzilla.kernel.org/show_bug.cgi?id=9382.
    
    Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Acked-by: Jeff Mahoney <jeffm@suse.com>

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index b670b97..63a2f81 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1798,6 +1798,11 @@ static int velocity_change_mtu(struct net_device *dev, int new_mtu)
 		return -EINVAL;
 	}
 
+	if (!netif_running(dev)) {
+		dev->mtu = new_mtu;
+		return 0;
+	}
+
 	if (new_mtu != oldmtu) {
 		spin_lock_irqsave(&vptr->lock, flags);