3 files changed, 6 insertions, 9 deletions

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index aee03221ed6e..798cc613c44a 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -900,7 +900,8 @@ qla2x00_get_starget_node_name(struct scsi_target *starget)
         u64 node_name = 0;
 
         list_for_each_entry(fcport, &ha->fcports, list) {
-                if (starget->id == fcport->os_target_id) {
+                if (fcport->rport &&
+                    starget->id == fcport->rport->scsi_target_id) {
                         node_name = wwn_to_u64(fcport->node_name);
                         break;
                 }
@@ -918,7 +919,8 @@ qla2x00_get_starget_port_name(struct scsi_target *starget)
         u64 port_name = 0;
 
         list_for_each_entry(fcport, &ha->fcports, list) {
-                if (starget->id == fcport->os_target_id) {
+                if (fcport->rport &&
+                    starget->id == fcport->rport->scsi_target_id) {
                         port_name = wwn_to_u64(fcport->port_name);
                         break;
                 }
@@ -936,7 +938,8 @@ qla2x00_get_starget_port_id(struct scsi_target *starget)
         uint32_t port_id = ~0U;
 
         list_for_each_entry(fcport, &ha->fcports, list) {
-                if (starget->id == fcport->os_target_id) {
+                if (fcport->rport &&
+                    starget->id == fcport->rport->scsi_target_id) {
                         port_id = fcport->d_id.b.domain << 16 |
                             fcport->d_id.b.area << 8 | fcport->d_id.b.al_pa;
                         break;
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index aa9d2163cdf2..f70c78b6f364 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1542,8 +1542,6 @@ typedef struct fc_port {
         atomic_t state;
         uint32_t flags;
 
-        unsigned int os_target_id;
-
         int port_login_retry_count;
         int login_retry;
         atomic_t port_down_timer;
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 9b7ad590eb01..e773697cd8d5 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2251,10 +2251,6 @@ qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport)
         if (fcport->port_type == FCT_TARGET)
                 rport_ids.roles |= FC_RPORT_ROLE_FCP_TARGET;
         fc_remote_port_rolechg(rport, rport_ids.roles);
-
-        if (rport->scsi_target_id != -1 &&
-            rport->scsi_target_id < ha->host->max_id)
-                fcport->os_target_id = rport->scsi_target_id;
 }
 
 /*