From d50939fb96c8b046e6abeb1a6d389aa6b2df09ca Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Thu, 28 Jul 2005 15:00:15 -0400
Subject: [PATCH] --- yaml --- r: 6063 b: refs/heads/master c:
 6b38aefe924daf2e4fdd73b384f21c913f31b668 h: refs/heads/master i:   6061:
 df14998545e55bef17c310f34a253e2394cc18d8   6059:
 0c4f8e5ff868b1123e7689e97d6504b26924c918   6055:
 c3a59b19d77a622402cf38d9b6062b596e67c08b   6047:
 aa54072e4ffa87c12172b3f4a56de3aace95d03c v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/net/bonding/bond_alb.c | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index db461a153096..4e7b1a800e29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00db8189d984d6c51226dafbbe4a667ce9b7d5da
+refs/heads/master: 6b38aefe924daf2e4fdd73b384f21c913f31b668
diff --git a/trunk/drivers/net/bonding/bond_alb.c b/trunk/drivers/net/bonding/bond_alb.c
index 5ce606d9dc03..19e829b567d0 100644
--- a/trunk/drivers/net/bonding/bond_alb.c
+++ b/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.