diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-04-26 11:39:19 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-04-26 11:39:19 +0200 |
| commit | 85ca719e5756d79ea0f10c469e3762462ac45e22 (patch) | |
| tree | d03324ade4c621b255fa1117a35a50b273d97437 /net/bridge/br_forward.c | |
| parent | [PATCH] Alpha: strncpy() fix (diff) | |
| download | linux-85ca719e5756d79ea0f10c469e3762462ac45e22.tar.xz linux-85ca719e5756d79ea0f10c469e3762462ac45e22.zip | |
[BRIDGE]: allow full size vlan packets
Need to allow for VLAN header when bridging.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_forward.c')
| -rw-r--r-- | net/bridge/br_forward.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index 2d24fb400e0c..56f3aa47e758 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -16,6 +16,7 @@ #include <linux/kernel.h> #include <linux/netdevice.h> #include <linux/skbuff.h> +#include <linux/if_vlan.h> #include <linux/netfilter_bridge.h> #include "br_private.h" @@ -29,10 +30,15 @@ static inline int should_deliver(const struct net_bridge_port *p, return 1; } +static inline unsigned packet_length(const struct sk_buff *skb) +{ + return skb->len - (skb->protocol == htons(ETH_P_8021Q) ? VLAN_HLEN : 0); +} + int br_dev_queue_push_xmit(struct sk_buff *skb) { /* drop mtu oversized packets except tso */ - if (skb->len > skb->dev->mtu && !skb_shinfo(skb)->tso_size) + if (packet_length(skb) > skb->dev->mtu && !skb_shinfo(skb)->tso_size) kfree_skb(skb); else { #ifdef CONFIG_BRIDGE_NETFILTER |