bridge: allow full size vlan packets (repost)
Subsystems (3)
PATCH 1/1 bridge: allow full size vlan packets (repost)
Need to allow for VLAN header when bridging.
Signed-off-by Stephen Hemminger <[email protected]>
net/bridge/br_forward.c +7 -1
@@ -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 @@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
From: Stephen Hemminger <[email protected]>
Date: Tue, 25 Apr 2006 11:08:12 -0700
Quoted 3 lines
Need to allow for VLAN header when bridging.
Signed-off-by Stephen Hemminger <[email protected]>
Applied, thanks Stephen.