From 12c2b2e6571a2f570dede4cfa177538ee9e68c73 Mon Sep 17 00:00:00 2001 From: Jiri Bohac Date: Fri, 10 Jun 2011 10:27:20 +0000 Subject: [PATCH] --- yaml --- r: 255512 b: refs/heads/master c: 830a9c75514b477994fd3847f72654d3dbdfa5ca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index fd344b7b94a0..6a765ce38a8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 539d3ee6376eba05ebd947c81d097e31a3ee42a8 +refs/heads/master: 830a9c75514b477994fd3847f72654d3dbdfa5ca diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index bb1af9c1629f..07e866d5a87c 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/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; }