From: Quinn Tran <quinn.tran@cavium.com>

Date: Fri, 31 Aug 2018 11:24:29 -0700

Subject: [PATCH] scsi: qla2xxx: Update rscn_rcvd field to more meaningful

 scan_needed

References: bsc#1108870

Git-commit: cb873ba4002095d1e2fc60521bc4d860c7b72b92

Patch-mainline: v4.20-rc1

Rename rscn_rcvd field to scan_needed to be more meaningful.

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>

Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Signed-off-by: Hannes Reinecke <hare@suse.de>

---

 drivers/scsi/qla2xxx/qla_def.h  |  2 +-

 drivers/scsi/qla2xxx/qla_gs.c   | 12 ++++++------

 drivers/scsi/qla2xxx/qla_init.c |  2 +-

 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h

index a9dc9c4a6382..c41d0dbbbd79 100644

--- a/drivers/scsi/qla2xxx/qla_def.h

+++ b/drivers/scsi/qla2xxx/qla_def.h

@@ -2351,7 +2351,7 @@ typedef struct fc_port {

 	unsigned int login_succ:1;

 	unsigned int query:1;

 	unsigned int id_changed:1;

-	unsigned int rscn_rcvd:1;

+	unsigned int scan_needed:1;

 	struct work_struct nvme_del_work;

 	struct completion nvme_del_done;

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c

index a0038d879b9d..c0c738bbdace 100644

--- a/drivers/scsi/qla2xxx/qla_gs.c

+++ b/drivers/scsi/qla2xxx/qla_gs.c

@@ -3951,7 +3951,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)

 		list_for_each_entry(fcport, &vha->vp_fcports, list) {

 			if (memcmp(rp->port_name, fcport->port_name, WWN_SIZE))

 				continue;

-			fcport->rscn_rcvd = 0;

+			fcport->scan_needed = 0;

 			fcport->scan_state = QLA_FCPORT_FOUND;

 			found = true;

 			/*

@@ -3981,12 +3981,12 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)

 	 */

 	list_for_each_entry(fcport, &vha->vp_fcports, list) {

 		if ((fcport->flags & FCF_FABRIC_DEVICE) == 0) {

-			fcport->rscn_rcvd = 0;

+			fcport->scan_needed = 0;

 			continue;

 		}

 		if (fcport->scan_state != QLA_FCPORT_FOUND) {

-			fcport->rscn_rcvd = 0;

+			fcport->scan_needed = 0;

 			if ((qla_dual_mode_enabled(vha) ||

 				qla_ini_mode_enabled(vha)) &&

 			    atomic_read(&fcport->state) == FCS_ONLINE) {

@@ -4005,7 +4005,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)

 				}

 			}

 		} else {

-			if (fcport->rscn_rcvd ||

+			if (fcport->scan_needed ||

 			    fcport->disc_state != DSC_LOGIN_COMPLETE) {

 				if (fcport->login_retry == 0) {

 					fcport->login_retry =

@@ -4015,7 +4015,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)

 					    fcport->port_name, fcport->loop_id,

 					    fcport->login_retry);

 				}

-				fcport->rscn_rcvd = 0;

+				fcport->scan_needed = 0;

 				qla24xx_fcport_handle_login(vha, fcport);

 			}

 		}

@@ -4030,7 +4030,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)

 	if (recheck) {

 		list_for_each_entry(fcport, &vha->vp_fcports, list) {

-			if (fcport->rscn_rcvd) {

+			if (fcport->scan_needed) {

 				set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags);

 				set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);

 				break;

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c

index 3eb3c4f554fa..6d9c8a017ae9 100644

--- a/drivers/scsi/qla2xxx/qla_init.c

+++ b/drivers/scsi/qla2xxx/qla_init.c

@@ -1551,7 +1551,7 @@ void qla2x00_fcport_event_handler(scsi_qla_host_t *vha, struct event_arg *ea)

 			fcport = qla2x00_find_fcport_by_nportid

 				(vha, &ea->id, 1);

 			if (fcport)

-				fcport->rscn_rcvd = 1;

+				fcport->scan_needed = 1;

 			spin_lock_irqsave(&vha->work_lock, flags);

 			if (vha->scan.scan_flags == 0) {

-- 

2.16.4