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

Commit 6942df7f authored by Joe Perches's avatar Joe Perches Committed by Robert Love
Browse files

scsi: Convert uses of compare_ether_addr to ether_addr_equal 



Preliminary to removing compare_ether_addr altogether:

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:

$ 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 avatarRobert Love <robert.w.love@intel.com>
parent 55d0ac5d

drivers/scsi/bnx2fc/bnx2fc_fcoe.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -542,8 +542,7 @@ static void bnx2fc_recv_frame(struct sk_buff *skb) 
	vn_port = fc_vport_id_lookup(lport, ntoh24(fh->fh_d_id));

	vn_port = fc_vport_id_lookup(lport, ntoh24(fh->fh_d_id));

	if (vn_port) {

	if (vn_port) {

		port = lport_priv(vn_port);

		port = lport_priv(vn_port);

		if (compare_ether_addr(port->data_src_addr, dest_mac)

		if (!ether_addr_equal(port->data_src_addr, dest_mac)) {

		    != 0) {

			BNX2FC_HBA_DBG(lport, "fpma mismatch\n");

			BNX2FC_HBA_DBG(lport, "fpma mismatch\n");

			put_cpu();

			put_cpu();

			kfree_skb(skb);

			kfree_skb(skb);

drivers/scsi/fcoe/fcoe.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1462,7 +1462,7 @@ static int fcoe_rcv(struct sk_buff *skb, struct net_device *netdev, 
	eh = eth_hdr(skb);

	eh = eth_hdr(skb);





	if (is_fip_mode(ctlr) &&

	if (is_fip_mode(ctlr) &&

	    compare_ether_addr(eh->h_source, ctlr->dest_addr)) {

	    !ether_addr_equal(eh->h_source, ctlr->dest_addr)) {

		FCOE_NETDEV_DBG(netdev, "wrong source mac address:%pM\n",

		FCOE_NETDEV_DBG(netdev, "wrong source mac address:%pM\n",

				eh->h_source);

				eh->h_source);

		goto err;

		goto err;

drivers/scsi/fcoe/fcoe_ctlr.c

+11 −11
Original line number Original line Diff line number Diff line
@@ -339,7 +339,7 @@ static void fcoe_ctlr_announce(struct fcoe_ctlr *fip) 
	spin_unlock_bh(&fip->ctlr_lock);

	spin_unlock_bh(&fip->ctlr_lock);

	sel = fip->sel_fcf;

	sel = fip->sel_fcf;





	if (sel && !compare_ether_addr(sel->fcf_mac, fip->dest_addr))

	if (sel && ether_addr_equal(sel->fcf_mac, fip->dest_addr))

		goto unlock;

		goto unlock;

	if (!is_zero_ether_addr(fip->dest_addr)) {

	if (!is_zero_ether_addr(fip->dest_addr)) {

		printk(KERN_NOTICE "libfcoe: host%d: "

		printk(KERN_NOTICE "libfcoe: host%d: "
@@ -1039,7 +1039,7 @@ static void fcoe_ctlr_recv_adv(struct fcoe_ctlr *fip, struct sk_buff *skb) 
		if (fcf->switch_name == new.switch_name &&

		if (fcf->switch_name == new.switch_name &&

		    fcf->fabric_name == new.fabric_name &&

		    fcf->fabric_name == new.fabric_name &&

		    fcf->fc_map == new.fc_map &&

		    fcf->fc_map == new.fc_map &&

		    compare_ether_addr(fcf->fcf_mac, new.fcf_mac) == 0) {

		    ether_addr_equal(fcf->fcf_mac, new.fcf_mac)) {

			found = 1;

			found = 1;

			break;

			break;

		}

		}
@@ -1379,7 +1379,7 @@ static void fcoe_ctlr_recv_clr_vlink(struct fcoe_ctlr *fip, 
			mp = (struct fip_mac_desc *)desc;

			mp = (struct fip_mac_desc *)desc;

			if (dlen < sizeof(*mp))

			if (dlen < sizeof(*mp))

				goto err;

				goto err;

			if (compare_ether_addr(mp->fd_mac, fcf->fcf_mac))

			if (!ether_addr_equal(mp->fd_mac, fcf->fcf_mac))

				goto err;

				goto err;

			desc_mask &= ~BIT(FIP_DT_MAC);

			desc_mask &= ~BIT(FIP_DT_MAC);

			break;

			break;
@@ -1457,8 +1457,8 @@ static void fcoe_ctlr_recv_clr_vlink(struct fcoe_ctlr *fip, 
			 * 'port_id' is already validated, check MAC address and

			 * 'port_id' is already validated, check MAC address and

			 * wwpn

			 * wwpn

			 */

			 */

			if (compare_ether_addr(fip->get_src_addr(vn_port),

			if (!ether_addr_equal(fip->get_src_addr(vn_port),

						vp->fd_mac) != 0 ||

					      vp->fd_mac) ||

				get_unaligned_be64(&vp->fd_wwpn) !=

				get_unaligned_be64(&vp->fd_wwpn) !=

							vn_port->wwpn)

							vn_port->wwpn)

				continue;

				continue;
@@ -1521,12 +1521,12 @@ static int fcoe_ctlr_recv_handler(struct fcoe_ctlr *fip, struct sk_buff *skb) 
		goto drop;

		goto drop;

	eh = eth_hdr(skb);

	eh = eth_hdr(skb);

	if (fip->mode == FIP_MODE_VN2VN) {

	if (fip->mode == FIP_MODE_VN2VN) {

		if (compare_ether_addr(eh->h_dest, fip->ctl_src_addr) &&

		if (!ether_addr_equal(eh->h_dest, fip->ctl_src_addr) &&

		    compare_ether_addr(eh->h_dest, fcoe_all_vn2vn) &&

		    !ether_addr_equal(eh->h_dest, fcoe_all_vn2vn) &&

		    compare_ether_addr(eh->h_dest, fcoe_all_p2p))

		    !ether_addr_equal(eh->h_dest, fcoe_all_p2p))

			goto drop;

			goto drop;

	} else if (compare_ether_addr(eh->h_dest, fip->ctl_src_addr) &&

	} else if (!ether_addr_equal(eh->h_dest, fip->ctl_src_addr) &&

		   compare_ether_addr(eh->h_dest, fcoe_all_enode))

		   !ether_addr_equal(eh->h_dest, fcoe_all_enode))

		goto drop;

		goto drop;

	fiph = (struct fip_header *)skb->data;

	fiph = (struct fip_header *)skb->data;

	op = ntohs(fiph->fip_op);

	op = ntohs(fiph->fip_op);
@@ -1898,7 +1898,7 @@ int fcoe_ctlr_recv_flogi(struct fcoe_ctlr *fip, struct fc_lport *lport, 
		 * address_mode flag to use FC_OUI-based Ethernet DA.

		 * address_mode flag to use FC_OUI-based Ethernet DA.

		 * Otherwise we use the FCoE gateway addr

		 * Otherwise we use the FCoE gateway addr

		 */

		 */

		if (!compare_ether_addr(sa, (u8[6])FC_FCOE_FLOGI_MAC)) {

		if (ether_addr_equal(sa, (u8[6])FC_FCOE_FLOGI_MAC)) {

			fcoe_ctlr_map_dest(fip);

			fcoe_ctlr_map_dest(fip);

		} else {

		} else {

			memcpy(fip->dest_addr, sa, ETH_ALEN);

			memcpy(fip->dest_addr, sa, ETH_ALEN);

drivers/scsi/fcoe/fcoe_sysfs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -653,7 +653,7 @@ static int fcoe_fcf_device_match(struct fcoe_fcf_device *new, 
	if (new->switch_name == old->switch_name &&

	if (new->switch_name == old->switch_name &&

	    new->fabric_name == old->fabric_name &&

	    new->fabric_name == old->fabric_name &&

	    new->fc_map == old->fc_map &&

	    new->fc_map == old->fc_map &&

	    compare_ether_addr(new->mac, old->mac) == 0)

	    ether_addr_equal(new->mac, old->mac))

		return 1;

		return 1;

	return 0;

	return 0;

}

}

drivers/scsi/fnic/fnic_fcs.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -651,13 +651,13 @@ void fnic_update_mac_locked(struct fnic *fnic, u8 *new) 




	if (is_zero_ether_addr(new))

	if (is_zero_ether_addr(new))

		new = ctl;

		new = ctl;

	if (!compare_ether_addr(data, new))

	if (ether_addr_equal(data, new))

		return;

		return;

	FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, "update_mac %pM\n", new);

	FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, "update_mac %pM\n", new);

	if (!is_zero_ether_addr(data) && compare_ether_addr(data, ctl))

	if (!is_zero_ether_addr(data) && !ether_addr_equal(data, ctl))

		vnic_dev_del_addr(fnic->vdev, data);

		vnic_dev_del_addr(fnic->vdev, data);

	memcpy(data, new, ETH_ALEN);

	memcpy(data, new, ETH_ALEN);

	if (compare_ether_addr(new, ctl))

	if (!ether_addr_equal(new, ctl))

		vnic_dev_add_addr(fnic->vdev, new);

		vnic_dev_add_addr(fnic->vdev, new);

}

}