diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-21 11:43:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 11:43:05 -0400 |
| commit | 2198a10b501fd4443430cb17e065a9e859cc58c9 (patch) | |
| tree | 87f3781d293da0f8f8f61615905eb7bf62b7c128 /net/core | |
| parent | 9941fb62762253774cc6177d0b9172ece5133fe1 (diff) | |
| parent | db5a753bf198ef7a50e17d2ff358adf37efe8648 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/dev.c
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index b2269ac04cb8..6d4218cdb739 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -1484,7 +1484,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb) | |||
| 1484 | nf_reset(skb); | 1484 | nf_reset(skb); |
| 1485 | 1485 | ||
| 1486 | if (unlikely(!(dev->flags & IFF_UP) || | 1486 | if (unlikely(!(dev->flags & IFF_UP) || |
| 1487 | (skb->len > (dev->mtu + dev->hard_header_len)))) { | 1487 | (skb->len > (dev->mtu + dev->hard_header_len + VLAN_HLEN)))) { |
| 1488 | atomic_long_inc(&dev->rx_dropped); | 1488 | atomic_long_inc(&dev->rx_dropped); |
| 1489 | kfree_skb(skb); | 1489 | kfree_skb(skb); |
| 1490 | return NET_RX_DROP; | 1490 | return NET_RX_DROP; |