From 6cff76220a5c928aeb61c5b53483ea6f3f9d3e1b Mon Sep 17 00:00:00 2001
From: Claudiu Manoil <claudiu.manoil@freescale.com>
Date: Thu, 14 Feb 2013 05:00:06 +0000
Subject: [PATCH] --- yaml --- r: 352468 b: refs/heads/master c:
 13f228da40cacdb3c4c23c8e1272c2ad37d1e4c0 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/ethernet/freescale/gianfar.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 965c91b707a5..4ba04935908a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61db26c6454b5a0bd74ec23968b568e38ea8321a
+refs/heads/master: 13f228da40cacdb3c4c23c8e1272c2ad37d1e4c0
diff --git a/trunk/drivers/net/ethernet/freescale/gianfar.c b/trunk/drivers/net/ethernet/freescale/gianfar.c
index d70f74c634de..b2c60772bd96 100644
--- a/trunk/drivers/net/ethernet/freescale/gianfar.c
+++ b/trunk/drivers/net/ethernet/freescale/gianfar.c
@@ -2385,9 +2385,6 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)
 	int oldsize = priv->rx_buffer_size;
 	int frame_size = new_mtu + ETH_HLEN;
 
-	if (gfar_is_vlan_on(priv))
-		frame_size += VLAN_HLEN;
-
 	if ((frame_size < 64) || (frame_size > JUMBO_FRAME_SIZE)) {
 		netif_err(priv, drv, dev, "Invalid MTU setting\n");
 		return -EINVAL;