---

yaml --- r: 352468 b: refs/heads/master c: 13f228d h: refs/heads/master v: v3
git-mirror · Feb 14, 2013 · 6cff762 · 6cff762
1 parent 5f2cc9b
commit 6cff762
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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;