mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 14:12:06 +00:00
[PATCH] bonding: ALB -- allow slave to use bond's MAC address if its own MAC address conflicts
In ALB mode, allow new slave to use bond's MAC address if the new slave's MAC address is being used within the bond and no other slave is using the bond's MAC address. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
parent
00db8189d9
commit
6b38aefe92
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user