---

yaml --- r: 215520 b: refs/heads/master c: d2ed817 h: refs/heads/master v: v3
git-mirror · Oct 21, 2010 · f409589 · f409589
1 parent 1edcd51
commit f409589
Show file tree

Hide file tree

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