[PATCH 2/2] bonding: restore NETIF_F_VLAN_CHALLENGED properly in bond_del_vlan()
From: Jiri Bohac <hidden>
Date: 2011-06-03 20:14:26
Subsystem:
bonding driver, networking drivers, the rest · Maintainers:
Jay Vosburgh, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Since commit ad1afb00, bond_del_vlan() never restores NETIF_F_VLAN_CHALLENGED as intended. bond->vlan_list is never empty once the 8021q module is loaded, because the special VLAN 0 is always kept registered on the bond interface. Change the condition to check if bond->vlan_list contains exactly one item instead of checking for an empty list. Signed-off-by: Jiri Bohac <redacted>
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 17b4dd9..4d317cd 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c@@ -329,9 +329,10 @@ static int bond_del_vlan(struct bonding *bond, unsigned short vlan_id) kfree(vlan); - if (list_empty(&bond->vlan_list) && + if (bond->vlan_list.next->next == &bond->vlan_list && (bond->slave_cnt == 0)) { - /* Last VLAN removed and no slaves, so + /* Last VLAN removed (the only member of vlan_list + * is the special vid == 0 vlan) and no slaves, so * restore block on adding VLANs. This will * be removed once new slaves that are not * VLAN challenged will be added.
--
Jiri Bohac <jbohac@suse.cz>
SUSE Labs, SUSE CZ