diff options
| author | Jerome Borsboom <j.borsboom@erasmusmc.nl> | 2007-04-14 01:12:47 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-04-14 01:12:47 +0200 |
| commit | 279e172a580d415b83eba4f9fbbc77b08e546553 (patch) | |
| tree | ab9701560e9cffb927f367fad0b1ddd3b3100259 /net | |
| parent | [PKTGEN]: Add try_to_freeze() (diff) | |
| download | linux-279e172a580d415b83eba4f9fbbc77b08e546553.tar.xz linux-279e172a580d415b83eba4f9fbbc77b08e546553.zip | |
[VLAN]: Allow VLAN interface on top of bridge interface
When a VLAN interface is created on top of a bridge interface and
netfilter is enabled to see the bridged packets, the packets can be
corrupted when passing through the netfilter code. This is caused by the
VLAN driver not setting the 'protocol' and 'nh' members of the sk_buff
structure. In general, this is no problem as the VLAN interface is mostly
connected to a physical ethernet interface which does not use the
'protocol' and 'nh' members. For a bridge interface, however, these
members do matter.
Signed-off-by: Jerome Borsboom <j.borsboom@erasmusmc.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/8021q/vlan_dev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 2fc8fe2cb366..b6e0eea1e39e 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -380,6 +380,9 @@ int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, } else { vhdr->h_vlan_encapsulated_proto = htons(len); } + + skb->protocol = htons(ETH_P_8021Q); + skb->nh.raw = skb->data; } /* Before delegating work to the lower layer, enter our MAC-address */ |