|
@@ -625,6 +625,23 @@ static void bond_set_dev_addr(struct net_device *bond_dev,
|
|
|
call_netdevice_notifiers(NETDEV_CHANGEADDR, bond_dev);
|
|
|
}
|
|
|
|
|
|
+static struct slave *bond_get_old_active(struct bonding *bond,
|
|
|
+ struct slave *new_active)
|
|
|
+{
|
|
|
+ struct slave *slave;
|
|
|
+ struct list_head *iter;
|
|
|
+
|
|
|
+ bond_for_each_slave(bond, slave, iter) {
|
|
|
+ if (slave == new_active)
|
|
|
+ continue;
|
|
|
+
|
|
|
+ if (ether_addr_equal(bond->dev->dev_addr, slave->dev->dev_addr))
|
|
|
+ return slave;
|
|
|
+ }
|
|
|
+
|
|
|
+ return NULL;
|
|
|
+}
|
|
|
+
|
|
|
/* bond_do_fail_over_mac
|
|
|
*
|
|
|
* Perform special MAC address swapping for fail_over_mac settings
|
|
@@ -652,6 +669,9 @@ static void bond_do_fail_over_mac(struct bonding *bond,
|
|
|
if (!new_active)
|
|
|
return;
|
|
|
|
|
|
+ if (!old_active)
|
|
|
+ old_active = bond_get_old_active(bond, new_active);
|
|
|
+
|
|
|
if (old_active) {
|
|
|
ether_addr_copy(tmp_mac, new_active->dev->dev_addr);
|
|
|
ether_addr_copy(saddr.sa_data,
|