diff options
author | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 05:56:29 -0800 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 05:56:29 -0800 |
commit | e61745769125a3c788e7aceb2a5fb680ebb461e6 (patch) | |
tree | c8219c31767c8d6a64938626dd93069847d1d5b8 /drivers/scsi/qla2xxx/qla_init.c | |
parent | scsi: blacklist RSOC for Microsoft iSCSI target devices (diff) | |
parent | storvsc: ring buffer failures may result in I/O freeze (diff) | |
download | linux-dev-e61745769125a3c788e7aceb2a5fb680ebb461e6.tar.xz linux-dev-e61745769125a3c788e7aceb2a5fb680ebb461e6.zip |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_init.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index a4dde7e80dbd..e59f25bff7ab 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -3237,8 +3237,6 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport) struct fc_rport *rport; unsigned long flags; - qla2x00_rport_del(fcport); - rport_ids.node_name = wwn_to_u64(fcport->node_name); rport_ids.port_name = wwn_to_u64(fcport->port_name); rport_ids.port_id = fcport->d_id.b.domain << 16 | |