Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[BRIDGE]: allow full size vlan packets
+7
-1
net/bridge/br_forward.c
+7
-1
net/bridge/br_forward.c
···
16
16
#include <linux/kernel.h>
17
17
#include <linux/netdevice.h>
18
18
#include <linux/skbuff.h>
19
+
#include <linux/if_vlan.h>
19
20
#include <linux/netfilter_bridge.h>
20
21
#include "br_private.h"
21
22
···
30
29
return 1;
31
30
}
32
31
32
+
static inline unsigned packet_length(const struct sk_buff *skb)
33
+
{
34
+
return skb->len - (skb->protocol == htons(ETH_P_8021Q) ? VLAN_HLEN : 0);
35
+
}
36
+
33
37
int br_dev_queue_push_xmit(struct sk_buff *skb)
34
38
{
35
39
/* drop mtu oversized packets except tso */
36
-
if (skb->len > skb->dev->mtu && !skb_shinfo(skb)->tso_size)
40
+
if (packet_length(skb) > skb->dev->mtu && !skb_shinfo(skb)->tso_size)
37
41
kfree_skb(skb);
38
42
else {
39
43
#ifdef CONFIG_BRIDGE_NETFILTER