diff options
Diffstat (limited to 'drivers/net/bonding/bond_alb.c')
| -rw-r--r-- | drivers/net/bonding/bond_alb.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index 5ce606d9dc03..19e829b567d0 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c | |||
| @@ -1106,18 +1106,13 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav | |||
| 1106 | } | 1106 | } |
| 1107 | } | 1107 | } |
| 1108 | 1108 | ||
| 1109 | if (found) { | 1109 | if (!found) |
| 1110 | /* a slave was found that is using the mac address | 1110 | return 0; |
| 1111 | * of the new slave | ||
| 1112 | */ | ||
| 1113 | printk(KERN_ERR DRV_NAME | ||
| 1114 | ": Error: the hw address of slave %s is not " | ||
| 1115 | "unique - cannot enslave it!", | ||
| 1116 | slave->dev->name); | ||
| 1117 | return -EINVAL; | ||
| 1118 | } | ||
| 1119 | 1111 | ||
| 1120 | return 0; | 1112 | /* Try setting slave mac to bond address and fall-through |
| 1113 | to code handling that situation below... */ | ||
| 1114 | alb_set_slave_mac_addr(slave, bond->dev->dev_addr, | ||
| 1115 | bond->alb_info.rlb_enabled); | ||
| 1121 | } | 1116 | } |
| 1122 | 1117 | ||
| 1123 | /* The slave's address is equal to the address of the bond. | 1118 | /* The slave's address is equal to the address of the bond. |