The patch titled
allow VLAN interface on top of bridge interface
has been removed from the -mm tree. Its filename was
allow-vlan-interface-on-top-of-bridge-interface.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: allow VLAN interface on top of bridge interface
From: Jerome Borsboom <j.borsboom@xxxxxxxxxxxx>
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@xxxxxxxxxxxx>
Cc: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/8021q/vlan_dev.c | 3 +++
1 files changed, 3 insertions(+)
diff -puN net/8021q/vlan_dev.c~allow-vlan-interface-on-top-of-bridge-interface net/8021q/vlan_dev.c
--- a/net/8021q/vlan_dev.c~allow-vlan-interface-on-top-of-bridge-interface
+++ a/net/8021q/vlan_dev.c
@@ -380,6 +380,9 @@ int vlan_dev_hard_header(struct sk_buff
} else {
vhdr->h_vlan_encapsulated_proto = htons(len);
}
+
+ skb->protocol = htons(ETH_P_8021Q);
+ skb_reset_network_header(skb);
}
/* Before delegating work to the lower layer, enter our MAC-address */
_
Patches currently in -mm which might be from j.borsboom@xxxxxxxxxxxx are
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
