diff options
| author | Ben Greear <greearb@candelatech.com> | 2010-10-21 04:06:29 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-22 11:00:15 -0800 |
| commit | e26158f99c3c79181eb3e314e898079565cc75fd (patch) | |
| tree | de424e69cb6541d3684a0f60761ed086f715e5f2 | |
| parent | 3f266b04185de51d8e6446eb1fccec3b5e7ce575 (diff) | |
net/core: Allow tagged VLAN packets to flow through VETH devices.
[ Upstream commit d2ed817766987fd05e69b7da65d4861b38f1aa2a ]
When there are VLANs on a VETH device, the packets being transmitted
through the VETH device may be 4 bytes bigger than MTU. A check
in dev_forward_skb did not take this into account and so dropped
these packets.
This patch is needed at least as far back as 2.6.34.7 and should
be considered for -stable.
Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 ca47a64929ff..a7054e88eb67 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1491,7 +1491,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; } |