---

yaml --- r: 360772 b: refs/heads/master c: 6c8c4e4 h: refs/heads/master v: v3
git-mirror · Feb 26, 2013 · 9663ca5 · 9663ca5
1 parent 11e0ddd
commit 9663ca5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0237c11044b3670adcbe80cd6dd721285347f497
+refs/heads/master: 6c8c4e4c24b9f6cee3d356a51e4a7f2af787a49b
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
@@ -1629,7 +1629,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 
 	/* If this is the first slave, then we need to set the master's hardware
 	 * address to be the same as the slave's. */
-	if (bond->dev_addr_from_first)
+	if (bond->slave_cnt == 0 && bond->dev_addr_from_first)
 		bond_set_dev_addr(bond->dev, slave_dev);
 
 	new_slave = kzalloc(sizeof(struct slave), GFP_KERNEL);