Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 844223ab authored by dingtianhong's avatar dingtianhong Committed by David S. Miller
Browse files

bonding: use ether_addr_equal_64bits to instead of ether_addr_equal 



The net_device.dev_addr have more than 2 bytes of additional data after
the mac addr, so it is safe to use the ether_addr_equal_64bits().

Signed-off-by: default avatarDing Tianhong <dingtianhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 359632e5

drivers/net/bonding/bond_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1637,7 +1637,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
err_undo_flags:

	/* Enslave of first slave has failed and we need to fix master's mac */

	if (!bond_has_slaves(bond) &&

	    ether_addr_equal(bond_dev->dev_addr, slave_dev->dev_addr))

	    ether_addr_equal_64bits(bond_dev->dev_addr, slave_dev->dev_addr))

		eth_hw_addr_random(bond_dev);



	return res;
@@ -1710,7 +1710,7 @@ static int __bond_release_one(struct net_device *bond_dev, 
	bond->current_arp_slave = NULL;



	if (!all && !bond->params.fail_over_mac) {

		if (ether_addr_equal(bond_dev->dev_addr, slave->perm_hwaddr) &&

		if (ether_addr_equal_64bits(bond_dev->dev_addr, slave->perm_hwaddr) &&

		    bond_has_slaves(bond))

			pr_warn("%s: Warning: the permanent HWaddr of %s - %pM - is still in use by %s. Set the HWaddr of %s to a different address to avoid conflicts.\n",

				   bond_dev->name, slave_dev->name,