bonding: reset master mac on first enslave failure
If the bond device is supposed to get the first slave's MAC address and the first enslavement fails then we need to reset the master's MAC otherwise it will stay the same as the failed slave device. We do it after err_undo_flags since that is the first place where the MAC can be changed and we check if it should've been the first slave and if the bond's MAC was set to it because that err place is used by multiple locations prior to changing the master's MAC address. Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
2dc85bf323
commit
b8fad459f9
|
@ -1957,6 +1957,10 @@ err_free:
|
||||||
|
|
||||||
err_undo_flags:
|
err_undo_flags:
|
||||||
bond_compute_features(bond);
|
bond_compute_features(bond);
|
||||||
|
/* Enslave of first slave has failed and we need to fix master's mac */
|
||||||
|
if (bond->slave_cnt == 0 &&
|
||||||
|
ether_addr_equal(bond_dev->dev_addr, slave_dev->dev_addr))
|
||||||
|
eth_hw_addr_random(bond_dev);
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue