---

yaml --- r: 223181 b: refs/heads/master c: d13a2cb h: refs/heads/master i: 223179: 77c2f2e v: v3
git-mirror · Dec 1, 2010 · a3b9dbe · a3b9dbe
1 parent f73c5d3
commit a3b9dbe
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: 6c08af030212d1a34593397bb01f262ff31c3629
+refs/heads/master: d13a2cb63d06fe2e3067c7d40f9a5946abd614c8
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
@@ -1576,7 +1576,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->slave_cnt == 0)
+	if (is_zero_ether_addr(bond->dev->dev_addr))
 		memcpy(bond->dev->dev_addr, slave_dev->dev_addr,
 		       slave_dev->addr_len);