summaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorJiri Bohac <jbohac@suse.cz>2011-06-10 10:27:20 +0000
committerDavid S. Miller <davem@davemloft.net>2011-06-11 16:13:29 -0700
commit830a9c75514b477994fd3847f72654d3dbdfa5ca (patch)
tree945e3a5187560332c4acbfd6cefee93b19a97d21 /drivers/net/bonding
parent539d3ee6376eba05ebd947c81d097e31a3ee42a8 (diff)
downloadblackbird-op-linux-830a9c75514b477994fd3847f72654d3dbdfa5ca.tar.gz
blackbird-op-linux-830a9c75514b477994fd3847f72654d3dbdfa5ca.zip
bonding: clean up bond_del_vlan()
1) the setting of NETIF_F_VLAN_CHALLENGED in bond_del_vlan() is useless since commit b2a103e6 because bond_fix_features() now sets NETIF_F_VLAN_CHALLENGED whenever the last slave is being removed. 2) the code never triggers anyway as vlan_list is never empty since ad1afb00. Signed-off-by: Jiri Bohac <jbohac@suse.cz> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_main.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index bb1af9c1629f..07e866d5a87c 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -329,16 +329,6 @@ static int bond_del_vlan(struct bonding *bond, unsigned short vlan_id)
kfree(vlan);
- if (list_empty(&bond->vlan_list) &&
- (bond->slave_cnt == 0)) {
- /* Last VLAN removed and no slaves, so
- * restore block on adding VLANs. This will
- * be removed once new slaves that are not
- * VLAN challenged will be added.
- */
- bond->dev->features |= NETIF_F_VLAN_CHALLENGED;
- }
-
res = 0;
goto out;
}
OpenPOWER on IntegriCloud