[PATCH] allow VLAN interface on top of bridge interface

[PATCH] allow VLAN interface on top of bridge interface

[Jerome Borsboom]

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>


--- linux-2.6.20/net/8021q/vlan_dev.c 2007-02-04 19:44:54.000000000 +0100 
+++ linux-2.6.20/net/8021q/vlan_dev.c 2007-04-12 21:12:17.000000000 +0200 
@@ -380,6 +380,9 @@
  		} 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 */

Re: [PATCH] allow VLAN interface on top of bridge interface

[David Miller]

From: Jerome Borsboom <j.borsboom@erasmusmc.nl>
Date: Thu, 12 Apr 2007 21:50:00 +0200 (CEST)

> 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>

I'll apply this, thanks a lot Jerome.

Re: [PATCH] allow VLAN interface on top of bridge interface

[David Miller]

Jerome, btw, in the future please fix your email client.

It added extra spaces and also deleted some in the patch,
making the patch not apply without a lot of hand-editing.