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

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

drivers/net: Convert uses of compare_ether_addr to ether_addr_equal 



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

Done via cocci script: (and a little typing)

$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
-	!compare_ether_addr(a, b)
+	ether_addr_equal(a, b)

@@
expression a,b;
@@
-	compare_ether_addr(a, b)
+	!ether_addr_equal(a, b)

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

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

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

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

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

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

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+2 −2
Original line number Diff line number Diff line
@@ -488,8 +488,8 @@ static bool ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector, 
		 * source pruning.

		 */

		if ((skb->pkt_type & (PACKET_BROADCAST | PACKET_MULTICAST)) &&

		    !(compare_ether_addr(adapter->netdev->dev_addr,

					eth_hdr(skb)->h_source))) {

		    ether_addr_equal(adapter->netdev->dev_addr,

				     eth_hdr(skb)->h_source)) {

			dev_kfree_skb_irq(skb);

			goto next_desc;

		}

drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c

+2 −2
Original line number Diff line number Diff line
@@ -1652,14 +1652,14 @@ int qlcnic_sriov_set_vf_mac(struct net_device *netdev, int vf, u8 *mac) 
	if (!is_valid_ether_addr(mac) || vf >= num_vfs)

		return -EINVAL;



	if (!compare_ether_addr(adapter->mac_addr, mac)) {

	if (ether_addr_equal(adapter->mac_addr, mac)) {

		netdev_err(netdev, "MAC address is already in use by the PF\n");

		return -EINVAL;

	}



	for (i = 0; i < num_vfs; i++) {

		vf_info = &sriov->vf_info[i];

		if (!compare_ether_addr(vf_info->vp->mac, mac)) {

		if (ether_addr_equal(vf_info->vp->mac, mac)) {

			netdev_err(netdev,

				   "MAC address is already in use by VF %d\n",

				   i);

drivers/net/ethernet/tile/tilegx.c

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static inline bool filter_packet(struct net_device *dev, void *buf) 
	/* Filter out packets that aren't for us. */

	if (!(dev->flags & IFF_PROMISC) &&

	    !is_multicast_ether_addr(buf) &&

	    compare_ether_addr(dev->dev_addr, buf) != 0)

	    !ether_addr_equal(dev->dev_addr, buf))

		return true;



	return false;

drivers/net/usb/qmi_wwan.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf) 
	/* Never use the same address on both ends of the link, even

	 * if the buggy firmware told us to.

	 */

	if (!compare_ether_addr(dev->net->dev_addr, default_modem_addr))

	if (ether_addr_equal(dev->net->dev_addr, default_modem_addr))

		eth_hw_addr_random(dev->net);



	/* make MAC addr easily distinguishable from an IP header */

drivers/net/vxlan.c

+3 −4
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static struct vxlan_fdb *__vxlan_find_mac(struct vxlan_dev *vxlan, 
	struct vxlan_fdb *f;



	hlist_for_each_entry_rcu(f, head, hlist) {

		if (compare_ether_addr(mac, f->eth_addr) == 0)

		if (ether_addr_equal(mac, f->eth_addr))

			return f;

	}
@@ -1049,8 +1049,7 @@ static void vxlan_rcv(struct vxlan_sock *vs, 
	skb->protocol = eth_type_trans(skb, vxlan->dev);



	/* Ignore packet loops (and multicast echo) */

	if (compare_ether_addr(eth_hdr(skb)->h_source,

			       vxlan->dev->dev_addr) == 0)

	if (ether_addr_equal(eth_hdr(skb)->h_source, vxlan->dev->dev_addr))

		goto drop;



	/* Re-examine inner Ethernet packet */
@@ -1320,7 +1319,7 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb) 
	if (n) {

		bool diff;



		diff = compare_ether_addr(eth_hdr(skb)->h_dest, n->ha) != 0;

		diff = !ether_addr_equal(eth_hdr(skb)->h_dest, n->ha);

		if (diff) {

			memcpy(eth_hdr(skb)->h_source, eth_hdr(skb)->h_dest,

				dev->addr_len);