aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorBen Greear <greearb@candelatech.com>2010-10-21 04:06:29 -0700
committerDavid S. Miller <davem@davemloft.net>2010-10-21 04:06:29 -0700
commitd2ed817766987fd05e69b7da65d4861b38f1aa2a (patch)
tree0ae70ffb3eb107a8d28a53e1ef6e9dc3591a19c1 /net
parentd836b31e164e15a5f366199f4ee757c6be7dc91e (diff)
downloadmrst-s0i3-test-d2ed817766987fd05e69b7da65d4861b38f1aa2a.tar.gz
mrst-s0i3-test-d2ed817766987fd05e69b7da65d4861b38f1aa2a.tar.xz
mrst-s0i3-test-d2ed817766987fd05e69b7da65d4861b38f1aa2a.zip
net/core: Allow tagged VLAN packets to flow through VETH devices.
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>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 660dd41aaaa..8e07109cc0e 100644
--- a/net/core/dev.c
+++ b/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;
}