---

yaml --- r: 362653 b: refs/heads/master c: a506e7b h: refs/heads/master i: 362651: 9879138 v: v3
git-mirror · Apr 19, 2013 · 7c1da1f · 7c1da1f
1 parent 12daf55
commit 7c1da1f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25e40305d4f4399bc8ecf9c9b7cf43493bb40bbd
+refs/heads/master: a506e7b479e1215c230e4b87fedc246cf748537f
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
@@ -1906,6 +1906,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 		bond_mc_list_flush(bond_dev, slave_dev);
 		netif_addr_unlock_bh(bond_dev);
 	}
+	bond_del_vlans_from_slave(bond, slave_dev);
 	write_lock_bh(&bond->lock);
 	bond_detach_slave(bond, new_slave);
 	write_unlock_bh(&bond->lock);