bonding: use compare_ether_addr
authorStephen Hemminger <shemminger@vyatta.com>
Fri, 28 Aug 2009 12:05:13 +0000 (12:05 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 29 Aug 2009 06:01:15 +0000 (23:01 -0700)
Bonding can use compare_ether_addr() in bond_release.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c

index 1aeb36c51478ba3c6ef5410e77224022fb98cded..ed00ba919d91f24b0f7ac03f6a966641e9b58bd2 100644 (file)
@@ -1796,7 +1796,6 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
        struct bonding *bond = netdev_priv(bond_dev);
        struct slave *slave, *oldcurrent;
        struct sockaddr addr;
-       int mac_addr_differ;
 
        /* slave is not a slave or master is not master of this slave */
        if (!(slave_dev->flags & IFF_SLAVE) ||
@@ -1820,9 +1819,8 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
        }
 
        if (!bond->params.fail_over_mac) {
-               mac_addr_differ = memcmp(bond_dev->dev_addr, slave->perm_hwaddr,
-                                        ETH_ALEN);
-               if (!mac_addr_differ && (bond->slave_cnt > 1))
+               if (!compare_ether_addr(bond_dev->dev_addr, slave->perm_hwaddr)
+                   && bond->slave_cnt > 1)
                        pr_warning(DRV_NAME
                               ": %s: Warning: the permanent HWaddr of %s - "
                               "%pM - is still in use by %s. "