| commit | 2198a10b501fd4443430cb17e065a9e859cc58c9 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Oct 21 08:43:05 2010 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Oct 21 08:43:05 2010 -0700 |
| tree | 87f3781d293da0f8f8f61615905eb7bf62b7c128 | |
| parent | 9941fb62762253774cc6177d0b9172ece5133fe1 [diff] [blame] | |
| parent | db5a753bf198ef7a50e17d2ff358adf37efe8648 [diff] [blame] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: net/core/dev.c
diff --git a/net/core/dev.c b/net/core/dev.c index b2269ac..6d4218c 100644 --- a/net/core/dev.c +++ b/net/core/dev.c
@@ -1484,7 +1484,7 @@ nf_reset(skb); if (unlikely(!(dev->flags & IFF_UP) || - (skb->len > (dev->mtu + dev->hard_header_len)))) { + (skb->len > (dev->mtu + dev->hard_header_len + VLAN_HLEN)))) { atomic_long_inc(&dev->rx_dropped); kfree_skb(skb); return NET_RX_DROP;