diff --git a/[refs] b/[refs] index e7e901bf0ba8..b43286f22f14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d06fc1d9b5518582f4982f908e820f2303d1eece +refs/heads/master: bd7b3f34198071d8bec05180530c362f1800ba46 diff --git a/trunk/drivers/net/via-velocity.c b/trunk/drivers/net/via-velocity.c index 5c4a92de9a07..450e29d7a9f3 100644 --- a/trunk/drivers/net/via-velocity.c +++ b/trunk/drivers/net/via-velocity.c @@ -1963,6 +1963,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);