[PATCH] VLAN over bonding

[Olaf Kirch <okir@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 497 bytes --]

Hi,

It seems when you create a VLAN configuration on top of a bonding
device, any normal (non-VLAN) traffic stops completely. The reason
is that bond_dev_queue_xmit() drops all outgoing frames that have
no VLAN tag.

The attached patch tries to fix this - is this the right way to do this,
or does that break other areas of VLAN-over-bonding?

Thanks
Olaf
-- 
Olaf Kirch   |  --- o --- Nous sommes du soleil we love when we play
okir@suse.de |    / | \   sol.dhoop.naytheet.ah kin.ir.samse.qurax

[-- Attachment #2: vlan-bonding-normal-frames --]
[-- Type: text/plain, Size: 769 bytes --]

Index: linux-2.6.10/drivers/net/bonding/bond_main.c
===================================================================
--- linux-2.6.10.orig/drivers/net/bonding/bond_main.c
+++ linux-2.6.10/drivers/net/bonding/bond_main.c
@@ -807,15 +807,10 @@ struct vlan_entry *bond_next_vlan(struct
 int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev)
 {
 	unsigned short vlan_id;
-	int res;
 
 	if (!list_empty(&bond->vlan_list) &&
-	    !(slave_dev->features & NETIF_F_HW_VLAN_TX)) {
-		res = vlan_get_tag(skb, &vlan_id);
-		if (res) {
-			return -EINVAL;
-		}
-
+	    !(slave_dev->features & NETIF_F_HW_VLAN_TX) &&
+	    vlan_get_tag(skb, &vlan_id) == 0) {
 		skb->dev = slave_dev;
 		skb = vlan_put_tag(skb, vlan_id);
 		if (!skb) {