Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[deliverable/linux.git] / drivers / net / bonding / bond_alb.c

diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 2e1f8066f1a8146b0f89cfb4a9e08e1f6b9a54bd..0f59c1564e53263248a889a7b29f80a87847c488 100644 (file)
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -332,7 +332,7 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)
        if ((client_info->assigned) &&
            (client_info->ip_src == arp->ip_dst) &&
            (client_info->ip_dst == arp->ip_src) &&
-           (compare_ether_addr_64bits(client_info->mac_dst, arp->mac_src))) {
+           (!ether_addr_equal_64bits(client_info->mac_dst, arp->mac_src))) {
                /* update the clients MAC address */
                memcpy(client_info->mac_dst, arp->mac_src, ETH_ALEN);
                client_info->ntt = 1;
@@ -450,8 +450,8 @@ static void rlb_clear_slave(struct bonding *bond, struct slave *slave)
 
                        if (assigned_slave) {
                                rx_hash_table[index].slave = assigned_slave;
-                               if (compare_ether_addr_64bits(rx_hash_table[index].mac_dst,
-                                                             mac_bcast)) {
+                               if (!ether_addr_equal_64bits(rx_hash_table[index].mac_dst,
+                                                            mac_bcast)) {
                                        bond_info->rx_hashtbl[index].ntt = 1;
                                        bond_info->rx_ntt = 1;
                                        /* A slave has been removed from the
@@ -563,7 +563,7 @@ static void rlb_req_update_slave_clients(struct bonding *bond, struct slave *sla
                client_info = &(bond_info->rx_hashtbl[hash_index]);
 
                if ((client_info->slave == slave) &&
-                   compare_ether_addr_64bits(client_info->mac_dst, mac_bcast)) {
+                   !ether_addr_equal_64bits(client_info->mac_dst, mac_bcast)) {
                        client_info->ntt = 1;
                        ntt = 1;
                }
@@ -602,9 +602,9 @@ static void rlb_req_update_subnet_clients(struct bonding *bond, __be32 src_ip)
                 * unicast mac address.
                 */
                if ((client_info->ip_src == src_ip) &&
-                   compare_ether_addr_64bits(client_info->slave->dev->dev_addr,
-                          bond->dev->dev_addr) &&
-                   compare_ether_addr_64bits(client_info->mac_dst, mac_bcast)) {
+                   !ether_addr_equal_64bits(client_info->slave->dev->dev_addr,
+                                            bond->dev->dev_addr) &&
+                   !ether_addr_equal_64bits(client_info->mac_dst, mac_bcast)) {
                        client_info->ntt = 1;
                        bond_info->rx_ntt = 1;
                }
@@ -631,7 +631,7 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon
                if ((client_info->ip_src == arp->ip_src) &&
                    (client_info->ip_dst == arp->ip_dst)) {
                        /* the entry is already assigned to this client */
-                       if (compare_ether_addr_64bits(arp->mac_dst, mac_bcast)) {
+                       if (!ether_addr_equal_64bits(arp->mac_dst, mac_bcast)) {
                                /* update mac address from arp */
                                memcpy(client_info->mac_dst, arp->mac_dst, ETH_ALEN);
                        }
@@ -666,7 +666,7 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon
                memcpy(client_info->mac_dst, arp->mac_dst, ETH_ALEN);
                client_info->slave = assigned_slave;
 
-               if (compare_ether_addr_64bits(client_info->mac_dst, mac_bcast)) {
+               if (!ether_addr_equal_64bits(client_info->mac_dst, mac_bcast)) {
                        client_info->ntt = 1;
                        bond->alb_info.rx_ntt = 1;
                } else {
@@ -1011,18 +1011,18 @@ static void alb_change_hw_addr_on_detach(struct bonding *bond, struct slave *sla
        int perm_curr_diff;
        int perm_bond_diff;
 
-       perm_curr_diff = compare_ether_addr_64bits(slave->perm_hwaddr,
-                                                  slave->dev->dev_addr);
-       perm_bond_diff = compare_ether_addr_64bits(slave->perm_hwaddr,
-                                                  bond->dev->dev_addr);
+       perm_curr_diff = !ether_addr_equal_64bits(slave->perm_hwaddr,
+                                                 slave->dev->dev_addr);
+       perm_bond_diff = !ether_addr_equal_64bits(slave->perm_hwaddr,
+                                                 bond->dev->dev_addr);
 
        if (perm_curr_diff && perm_bond_diff) {
                struct slave *tmp_slave;
                int i, found = 0;
 
                bond_for_each_slave(bond, tmp_slave, i) {
-                       if (!compare_ether_addr_64bits(slave->perm_hwaddr,
-                                                      tmp_slave->dev->dev_addr)) {
+                       if (ether_addr_equal_64bits(slave->perm_hwaddr,
+                                                   tmp_slave->dev->dev_addr)) {
                                found = 1;
                                break;
                        }
@@ -1076,10 +1076,10 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
         * check uniqueness of slave's mac address against the other
         * slaves in the bond.
         */
-       if (compare_ether_addr_64bits(slave->perm_hwaddr, bond->dev->dev_addr)) {
+       if (!ether_addr_equal_64bits(slave->perm_hwaddr, bond->dev->dev_addr)) {
                bond_for_each_slave(bond, tmp_slave1, i) {
-                       if (!compare_ether_addr_64bits(tmp_slave1->dev->dev_addr,
-                                                      slave->dev->dev_addr)) {
+                       if (ether_addr_equal_64bits(tmp_slave1->dev->dev_addr,
+                                                   slave->dev->dev_addr)) {
                                found = 1;
                                break;
                        }
@@ -1101,8 +1101,8 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
        bond_for_each_slave(bond, tmp_slave1, i) {
                found = 0;
                bond_for_each_slave(bond, tmp_slave2, j) {
-                       if (!compare_ether_addr_64bits(tmp_slave1->perm_hwaddr,
-                                                      tmp_slave2->dev->dev_addr)) {
+                       if (ether_addr_equal_64bits(tmp_slave1->perm_hwaddr,
+                                                   tmp_slave2->dev->dev_addr)) {
                                found = 1;
                                break;
                        }
@@ -1117,8 +1117,8 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
                }
 
                if (!has_bond_addr) {
-                       if (!compare_ether_addr_64bits(tmp_slave1->dev->dev_addr,
-                                                      bond->dev->dev_addr)) {
+                       if (ether_addr_equal_64bits(tmp_slave1->dev->dev_addr,
+                                                   bond->dev->dev_addr)) {
 
                                has_bond_addr = tmp_slave1;
                        }
@@ -1259,7 +1259,7 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
        case ETH_P_IP: {
                const struct iphdr *iph = ip_hdr(skb);
 
-               if (!compare_ether_addr_64bits(eth_data->h_dest, mac_bcast) ||
+               if (ether_addr_equal_64bits(eth_data->h_dest, mac_bcast) ||
                    (iph->daddr == ip_bcast) ||
                    (iph->protocol == IPPROTO_IGMP)) {
                        do_tx_balance = 0;
@@ -1273,7 +1273,7 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
                /* IPv6 doesn't really use broadcast mac address, but leave
                 * that here just in case.
                 */
-               if (!compare_ether_addr_64bits(eth_data->h_dest, mac_bcast)) {
+               if (ether_addr_equal_64bits(eth_data->h_dest, mac_bcast)) {
                        do_tx_balance = 0;
                        break;
                }
@@ -1281,7 +1281,7 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
                /* IPv6 uses all-nodes multicast as an equivalent to
                 * broadcasts in IPv4.
                 */
-               if (!compare_ether_addr_64bits(eth_data->h_dest, mac_v6_allmcast)) {
+               if (ether_addr_equal_64bits(eth_data->h_dest, mac_v6_allmcast)) {
                        do_tx_balance = 0;
                        break;
                }
@@ -1605,8 +1605,8 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave
                struct slave *tmp_slave;
                /* find slave that is holding the bond's mac address */
                bond_for_each_slave(bond, tmp_slave, i) {
-                       if (!compare_ether_addr_64bits(tmp_slave->dev->dev_addr,
-                                                      bond->dev->dev_addr)) {
+                       if (ether_addr_equal_64bits(tmp_slave->dev->dev_addr,
+                                                   bond->dev->dev_addr)) {
                                swap_slave = tmp_slave;
                                break;
                        }
@@ -1683,8 +1683,8 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr)
        swap_slave = NULL;
 
        bond_for_each_slave(bond, slave, i) {
-               if (!compare_ether_addr_64bits(slave->dev->dev_addr,
-                                              bond_dev->dev_addr)) {
+               if (ether_addr_equal_64bits(slave->dev->dev_addr,
+                                           bond_dev->dev_addr)) {
                        swap_slave = slave;
                        break;
                }