diff options
| author | James Bottomley | 2013-11-10 05:19:15 +0100 |
|---|---|---|
| committer | James Bottomley | 2013-11-10 05:19:15 +0100 |
| commit | 323f6226a816f0b01514d25fba5529e0e68636c3 (patch) | |
| tree | 964ca28650bc92ce0ed2ba87c1c16ba65f55ebf5 /drivers/scsi/fnic | |
| parent | [SCSI] scsi_error: Escalate to LUN reset if abort fails (diff) | |
| parent | scsi: Convert uses of compare_ether_addr to ether_addr_equal (diff) | |
| download | kernel-qcow2-linux-323f6226a816f0b01514d25fba5529e0e68636c3.tar.gz kernel-qcow2-linux-323f6226a816f0b01514d25fba5529e0e68636c3.tar.xz kernel-qcow2-linux-323f6226a816f0b01514d25fba5529e0e68636c3.zip | |
Merge tag 'fcoe-3.13' into for-linus
Pull Request for 3.13 for FCOE tree.
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/fnic')
| -rw-r--r-- | drivers/scsi/fnic/fnic_fcs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c index 60a1c50aa68f..1671325aec7f 100644 --- a/drivers/scsi/fnic/fnic_fcs.c +++ b/drivers/scsi/fnic/fnic_fcs.c @@ -658,13 +658,13 @@ void fnic_update_mac_locked(struct fnic *fnic, u8 *new) if (is_zero_ether_addr(new)) new = ctl; - if (!compare_ether_addr(data, new)) + if (ether_addr_equal(data, new)) return; 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); memcpy(data, new, ETH_ALEN); - if (compare_ether_addr(new, ctl)) + if (!ether_addr_equal(new, ctl)) vnic_dev_add_addr(fnic->vdev, new); } |