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

Commit a6700db1 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net, drivers/net: Convert compare_ether_addr_64bits to ether_addr_equal_64bits 



Use the new bool function ether_addr_equal_64bits to add
some clarity and reduce the likelihood for misuse of
compare_ether_addr_64bits for sorting.

Done via cocci script:

$ cat compare_ether_addr_64bits.cocci
@@
expression a,b;
@@
-	!compare_ether_addr_64bits(a, b)
+	ether_addr_equal_64bits(a, b)

@@
expression a,b;
@@
-	compare_ether_addr_64bits(a, b)
+	!ether_addr_equal_64bits(a, b)

@@
expression a,b;
@@
-	!ether_addr_equal_64bits(a, b) == 0
+	ether_addr_equal_64bits(a, b)

@@
expression a,b;
@@
-	!ether_addr_equal_64bits(a, b) != 0
+	!ether_addr_equal_64bits(a, b)

@@
expression a,b;
@@
-	ether_addr_equal_64bits(a, b) == 0
+	!ether_addr_equal_64bits(a, b)

@@
expression a,b;
@@
-	ether_addr_equal_64bits(a, b) != 0
+	ether_addr_equal_64bits(a, b)

@@
expression a,b;
@@
-	!!ether_addr_equal_64bits(a, b)
+	ether_addr_equal_64bits(a, b)

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent baf523c9

drivers/net/bonding/bond_alb.c

+29 −29
Original line number Original line Diff line number Diff line
@@ -332,7 +332,7 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp) 
	if ((client_info->assigned) &&

	if ((client_info->assigned) &&

	    (client_info->ip_src == arp->ip_dst) &&

	    (client_info->ip_src == arp->ip_dst) &&

	    (client_info->ip_dst == arp->ip_src) &&

	    (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 */

		/* update the clients MAC address */

		memcpy(client_info->mac_dst, arp->mac_src, ETH_ALEN);

		memcpy(client_info->mac_dst, arp->mac_src, ETH_ALEN);

		client_info->ntt = 1;

		client_info->ntt = 1;
@@ -448,7 +448,7 @@ static void rlb_clear_slave(struct bonding *bond, struct slave *slave) 




			if (assigned_slave) {

			if (assigned_slave) {

				rx_hash_table[index].slave = assigned_slave;

				rx_hash_table[index].slave = assigned_slave;

				if (compare_ether_addr_64bits(rx_hash_table[index].mac_dst,

				if (!ether_addr_equal_64bits(rx_hash_table[index].mac_dst,

							     mac_bcast)) {

							     mac_bcast)) {

					bond_info->rx_hashtbl[index].ntt = 1;

					bond_info->rx_hashtbl[index].ntt = 1;

					bond_info->rx_ntt = 1;

					bond_info->rx_ntt = 1;
@@ -561,7 +561,7 @@ static void rlb_req_update_slave_clients(struct bonding *bond, struct slave *sla 
		client_info = &(bond_info->rx_hashtbl[hash_index]);

		client_info = &(bond_info->rx_hashtbl[hash_index]);





		if ((client_info->slave == slave) &&

		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;

			client_info->ntt = 1;

			ntt = 1;

			ntt = 1;

		}

		}
@@ -600,9 +600,9 @@ static void rlb_req_update_subnet_clients(struct bonding *bond, __be32 src_ip) 
		 * unicast mac address.

		 * unicast mac address.

		 */

		 */

		if ((client_info->ip_src == src_ip) &&

		if ((client_info->ip_src == src_ip) &&

		    compare_ether_addr_64bits(client_info->slave->dev->dev_addr,

		    !ether_addr_equal_64bits(client_info->slave->dev->dev_addr,

					     bond->dev->dev_addr) &&

					     bond->dev->dev_addr) &&

		    compare_ether_addr_64bits(client_info->mac_dst, mac_bcast)) {

		    !ether_addr_equal_64bits(client_info->mac_dst, mac_bcast)) {

			client_info->ntt = 1;

			client_info->ntt = 1;

			bond_info->rx_ntt = 1;

			bond_info->rx_ntt = 1;

		}

		}
@@ -629,7 +629,7 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon 
		if ((client_info->ip_src == arp->ip_src) &&

		if ((client_info->ip_src == arp->ip_src) &&

		    (client_info->ip_dst == arp->ip_dst)) {

		    (client_info->ip_dst == arp->ip_dst)) {

			/* the entry is already assigned to this client */

			/* 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 */

				/* update mac address from arp */

				memcpy(client_info->mac_dst, arp->mac_dst, ETH_ALEN);

				memcpy(client_info->mac_dst, arp->mac_dst, ETH_ALEN);

			}

			}
@@ -664,7 +664,7 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon 
		memcpy(client_info->mac_dst, arp->mac_dst, ETH_ALEN);

		memcpy(client_info->mac_dst, arp->mac_dst, ETH_ALEN);

		client_info->slave = assigned_slave;

		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;

			client_info->ntt = 1;

			bond->alb_info.rx_ntt = 1;

			bond->alb_info.rx_ntt = 1;

		} else {

		} else {
@@ -1009,9 +1009,9 @@ static void alb_change_hw_addr_on_detach(struct bonding *bond, struct slave *sla 
	int perm_curr_diff;

	int perm_curr_diff;

	int perm_bond_diff;

	int perm_bond_diff;





	perm_curr_diff = compare_ether_addr_64bits(slave->perm_hwaddr,

	perm_curr_diff = !ether_addr_equal_64bits(slave->perm_hwaddr,

						  slave->dev->dev_addr);

						  slave->dev->dev_addr);

	perm_bond_diff = compare_ether_addr_64bits(slave->perm_hwaddr,

	perm_bond_diff = !ether_addr_equal_64bits(slave->perm_hwaddr,

						  bond->dev->dev_addr);

						  bond->dev->dev_addr);





	if (perm_curr_diff && perm_bond_diff) {

	if (perm_curr_diff && perm_bond_diff) {
@@ -1019,7 +1019,7 @@ static void alb_change_hw_addr_on_detach(struct bonding *bond, struct slave *sla 
		int i, found = 0;

		int i, found = 0;





		bond_for_each_slave(bond, tmp_slave, i) {

		bond_for_each_slave(bond, tmp_slave, i) {

			if (!compare_ether_addr_64bits(slave->perm_hwaddr,

			if (ether_addr_equal_64bits(slave->perm_hwaddr,

						    tmp_slave->dev->dev_addr)) {

						    tmp_slave->dev->dev_addr)) {

				found = 1;

				found = 1;

				break;

				break;
@@ -1074,9 +1074,9 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav 
	 * check uniqueness of slave's mac address against the other

	 * check uniqueness of slave's mac address against the other

	 * slaves in the bond.

	 * 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) {

		bond_for_each_slave(bond, tmp_slave1, i) {

			if (!compare_ether_addr_64bits(tmp_slave1->dev->dev_addr,

			if (ether_addr_equal_64bits(tmp_slave1->dev->dev_addr,

						    slave->dev->dev_addr)) {

						    slave->dev->dev_addr)) {

				found = 1;

				found = 1;

				break;

				break;
@@ -1099,7 +1099,7 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav 
	bond_for_each_slave(bond, tmp_slave1, i) {

	bond_for_each_slave(bond, tmp_slave1, i) {

		found = 0;

		found = 0;

		bond_for_each_slave(bond, tmp_slave2, j) {

		bond_for_each_slave(bond, tmp_slave2, j) {

			if (!compare_ether_addr_64bits(tmp_slave1->perm_hwaddr,

			if (ether_addr_equal_64bits(tmp_slave1->perm_hwaddr,

						    tmp_slave2->dev->dev_addr)) {

						    tmp_slave2->dev->dev_addr)) {

				found = 1;

				found = 1;

				break;

				break;
@@ -1115,7 +1115,7 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav 
		}

		}





		if (!has_bond_addr) {

		if (!has_bond_addr) {

			if (!compare_ether_addr_64bits(tmp_slave1->dev->dev_addr,

			if (ether_addr_equal_64bits(tmp_slave1->dev->dev_addr,

						    bond->dev->dev_addr)) {

						    bond->dev->dev_addr)) {





				has_bond_addr = tmp_slave1;

				has_bond_addr = tmp_slave1;
@@ -1257,7 +1257,7 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) 
	case ETH_P_IP: {

	case ETH_P_IP: {

		const struct iphdr *iph = ip_hdr(skb);

		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->daddr == ip_bcast) ||

		    (iph->protocol == IPPROTO_IGMP)) {

		    (iph->protocol == IPPROTO_IGMP)) {

			do_tx_balance = 0;

			do_tx_balance = 0;
@@ -1271,7 +1271,7 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) 
		/* IPv6 doesn't really use broadcast mac address, but leave

		/* IPv6 doesn't really use broadcast mac address, but leave

		 * that here just in case.

		 * 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;

			do_tx_balance = 0;

			break;

			break;

		}

		}
@@ -1279,7 +1279,7 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) 
		/* IPv6 uses all-nodes multicast as an equivalent to

		/* IPv6 uses all-nodes multicast as an equivalent to

		 * broadcasts in IPv4.

		 * 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;

			do_tx_balance = 0;

			break;

			break;

		}

		}
@@ -1603,7 +1603,7 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave 
		struct slave *tmp_slave;

		struct slave *tmp_slave;

		/* find slave that is holding the bond's mac address */

		/* find slave that is holding the bond's mac address */

		bond_for_each_slave(bond, tmp_slave, i) {

		bond_for_each_slave(bond, tmp_slave, i) {

			if (!compare_ether_addr_64bits(tmp_slave->dev->dev_addr,

			if (ether_addr_equal_64bits(tmp_slave->dev->dev_addr,

						    bond->dev->dev_addr)) {

						    bond->dev->dev_addr)) {

				swap_slave = tmp_slave;

				swap_slave = tmp_slave;

				break;

				break;
@@ -1681,7 +1681,7 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) 
	swap_slave = NULL;

	swap_slave = NULL;





	bond_for_each_slave(bond, slave, i) {

	bond_for_each_slave(bond, slave, i) {

		if (!compare_ether_addr_64bits(slave->dev->dev_addr,

		if (ether_addr_equal_64bits(slave->dev->dev_addr,

					    bond_dev->dev_addr)) {

					    bond_dev->dev_addr)) {

			swap_slave = slave;

			swap_slave = slave;

			break;

			break;

drivers/net/macvlan.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ static struct macvlan_dev *macvlan_hash_lookup(const struct macvlan_port *port, 
	struct hlist_node *n;

	struct hlist_node *n;





	hlist_for_each_entry_rcu(vlan, n, &port->vlan_hash[addr[5]], hlist) {

	hlist_for_each_entry_rcu(vlan, n, &port->vlan_hash[addr[5]], hlist) {

		if (!compare_ether_addr_64bits(vlan->dev->dev_addr, addr))

		if (ether_addr_equal_64bits(vlan->dev->dev_addr, addr))

			return vlan;

			return vlan;

	}

	}

	return NULL;

	return NULL;
@@ -96,7 +96,7 @@ static int macvlan_addr_busy(const struct macvlan_port *port, 
	 * currently in use by the underlying device or

	 * currently in use by the underlying device or

	 * another macvlan.

	 * another macvlan.

	 */

	 */

	if (!compare_ether_addr_64bits(port->dev->dev_addr, addr))

	if (ether_addr_equal_64bits(port->dev->dev_addr, addr))

		return 1;

		return 1;





	if (macvlan_hash_lookup(port, addr))

	if (macvlan_hash_lookup(port, addr))
@@ -118,8 +118,7 @@ static int macvlan_broadcast_one(struct sk_buff *skb, 
		return vlan->forward(dev, skb);

		return vlan->forward(dev, skb);





	skb->dev = dev;

	skb->dev = dev;

	if (!compare_ether_addr_64bits(eth->h_dest,

	if (ether_addr_equal_64bits(eth->h_dest, dev->broadcast))

				       dev->broadcast))

		skb->pkt_type = PACKET_BROADCAST;

		skb->pkt_type = PACKET_BROADCAST;

	else

	else

		skb->pkt_type = PACKET_MULTICAST;

		skb->pkt_type = PACKET_MULTICAST;

net/ethernet/eth.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -164,7 +164,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev) 
	eth = eth_hdr(skb);

	eth = eth_hdr(skb);





	if (unlikely(is_multicast_ether_addr(eth->h_dest))) {

	if (unlikely(is_multicast_ether_addr(eth->h_dest))) {

		if (!compare_ether_addr_64bits(eth->h_dest, dev->broadcast))

		if (ether_addr_equal_64bits(eth->h_dest, dev->broadcast))

			skb->pkt_type = PACKET_BROADCAST;

			skb->pkt_type = PACKET_BROADCAST;

		else

		else

			skb->pkt_type = PACKET_MULTICAST;

			skb->pkt_type = PACKET_MULTICAST;
@@ -179,7 +179,8 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev) 
	 */

	 */





	else if (1 /*dev->flags&IFF_PROMISC */ ) {

	else if (1 /*dev->flags&IFF_PROMISC */ ) {

		if (unlikely(compare_ether_addr_64bits(eth->h_dest, dev->dev_addr)))

		if (unlikely(!ether_addr_equal_64bits(eth->h_dest,

						      dev->dev_addr)))

			skb->pkt_type = PACKET_OTHERHOST;

			skb->pkt_type = PACKET_OTHERHOST;

	}

	}