---

yaml
---
r: 6063
b: refs/heads/master
c: 6b38aef
h: refs/heads/master
i:
  6061: df14998
  6059: 0c4f8e5
  6055: c3a59b1
  6047: aa54072
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00db8189d984d6c51226dafbbe4a667ce9b7d5da
+refs/heads/master: 6b38aefe924daf2e4fdd73b384f21c913f31b668

trunk/drivers/net/bonding/bond_alb.c

@@ -1106,18 +1106,13 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
 			}
 		}
 
-		if (found) {
-			/* a slave was found that is using the mac address
-			 * of the new slave
-			 */
-			printk(KERN_ERR DRV_NAME
-			       ": Error: the hw address of slave %s is not "
-			       "unique - cannot enslave it!",
-			       slave->dev->name);
-			return -EINVAL;
-		}
+		if (!found)
+			return 0;
 
-		return 0;
+		/* Try setting slave mac to bond address and fall-through
+		   to code handling that situation below... */
+		alb_set_slave_mac_addr(slave, bond->dev->dev_addr,
+				       bond->alb_info.rlb_enabled);
 	}
 
 	/* The slave's address is equal to the address of the bond.