From f4095891c90956c2d10db844373660149220f859 Mon Sep 17 00:00:00 2001
From: Ben Greear <greearb@candelatech.com>
Date: Thu, 21 Oct 2010 04:06:29 -0700
Subject: [PATCH] --- yaml --- r: 215520 b: refs/heads/master c:
 d2ed817766987fd05e69b7da65d4861b38f1aa2a h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9c715331e311..4d30284126a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d836b31e164e15a5f366199f4ee757c6be7dc91e
+refs/heads/master: d2ed817766987fd05e69b7da65d4861b38f1aa2a
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 660dd41aaaa6..8e07109cc0ef 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1485,7 +1485,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
 	nf_reset(skb);
 
 	if (!(dev->flags & IFF_UP) ||
-	    (skb->len > (dev->mtu + dev->hard_header_len))) {
+	    (skb->len > (dev->mtu + dev->hard_header_len + VLAN_HLEN))) {
 		kfree_skb(skb);
 		return NET_RX_DROP;
 	}