From e24a7d87c2b7b4854956c37a73e996021f57008a Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Fri, 8 Aug 2008 18:36:06 -0700
Subject: [PATCH] --- yaml --- r: 108768 b: refs/heads/master c:
 d53f706da808e6d93dc60b1910233a309009939f h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/e1000e/netdev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4643f9ab7aa8..f7e388f0447b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10f1b492135620a87970cad9f80439249dcce299
+refs/heads/master: d53f706da808e6d93dc60b1910233a309009939f
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c
index 4573c7b9cbd9..b8b26cf78de5 100644
--- a/trunk/drivers/net/e1000e/netdev.c
+++ b/trunk/drivers/net/e1000e/netdev.c
@@ -3724,7 +3724,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
 
-	if ((max_frame < ETH_ZLEN + ETH_FCS_LEN) ||
+	if ((new_mtu < ETH_ZLEN + ETH_FCS_LEN + VLAN_HLEN) ||
 	    (max_frame > MAX_JUMBO_FRAME_SIZE)) {
 		e_err("Invalid MTU setting\n");
 		return -EINVAL;