diff options
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 1aeb36c51478..ed00ba919d91 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -1796,7 +1796,6 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) | |||
| 1796 | struct bonding *bond = netdev_priv(bond_dev); | 1796 | struct bonding *bond = netdev_priv(bond_dev); |
| 1797 | struct slave *slave, *oldcurrent; | 1797 | struct slave *slave, *oldcurrent; |
| 1798 | struct sockaddr addr; | 1798 | struct sockaddr addr; |
| 1799 | int mac_addr_differ; | ||
| 1800 | 1799 | ||
| 1801 | /* slave is not a slave or master is not master of this slave */ | 1800 | /* slave is not a slave or master is not master of this slave */ |
| 1802 | if (!(slave_dev->flags & IFF_SLAVE) || | 1801 | if (!(slave_dev->flags & IFF_SLAVE) || |
| @@ -1820,9 +1819,8 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) | |||
| 1820 | } | 1819 | } |
| 1821 | 1820 | ||
| 1822 | if (!bond->params.fail_over_mac) { | 1821 | if (!bond->params.fail_over_mac) { |
| 1823 | mac_addr_differ = memcmp(bond_dev->dev_addr, slave->perm_hwaddr, | 1822 | if (!compare_ether_addr(bond_dev->dev_addr, slave->perm_hwaddr) |
| 1824 | ETH_ALEN); | 1823 | && bond->slave_cnt > 1) |
| 1825 | if (!mac_addr_differ && (bond->slave_cnt > 1)) | ||
| 1826 | pr_warning(DRV_NAME | 1824 | pr_warning(DRV_NAME |
| 1827 | ": %s: Warning: the permanent HWaddr of %s - " | 1825 | ": %s: Warning: the permanent HWaddr of %s - " |
| 1828 | "%pM - is still in use by %s. " | 1826 | "%pM - is still in use by %s. " |