---

yaml --- r: 255512 b: refs/heads/master c: 830a9c7 h: refs/heads/master v: v3
git-mirror · Jun 11, 2011 · 12c2b2e · 12c2b2e
1 parent e548159
commit 12c2b2e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git 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
@@ -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;
 		}