diff options
author | James Bottomley <JBottomley@Parallels.com> | 2013-11-10 05:19:15 +0100 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-11-10 05:19:15 +0100 |
commit | 323f6226a816f0b01514d25fba5529e0e68636c3 (patch) | |
tree | 964ca28650bc92ce0ed2ba87c1c16ba65f55ebf5 /drivers/scsi/bnx2fc | |
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 | linux-323f6226a816f0b01514d25fba5529e0e68636c3.tar.xz 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/bnx2fc')
-rw-r--r-- | drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c index 3c204ad1d5b9..9b948505d118 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c +++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c @@ -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)); if (vn_port) { port = lport_priv(vn_port); - if (compare_ether_addr(port->data_src_addr, dest_mac) - != 0) { + if (!ether_addr_equal(port->data_src_addr, dest_mac)) { BNX2FC_HBA_DBG(lport, "fpma mismatch\n"); put_cpu(); kfree_skb(skb); @@ -1381,6 +1380,7 @@ struct bnx2fc_interface *bnx2fc_interface_create(struct bnx2fc_hba *hba, return NULL; } ctlr = fcoe_ctlr_device_priv(ctlr_dev); + ctlr->cdev = ctlr_dev; interface = fcoe_ctlr_priv(ctlr); dev_hold(netdev); kref_init(&interface->kref); |