scsi: qla2xxx: Update rscn_rcvd field to more meaningful scan_needed

commit cb873ba4002095d1e2fc60521bc4d860c7b72b92 upstream.

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: Zhengyuan Liu <liuzhengyuan@kylinos.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index a9dc9c4a6382615175a127d9df9507baefa8dd72..c41d0dbbbd797eb280f7c32c7aac2beb927d61f8 100644 (file)
--- 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 f621cb55ccfb27196605f849d8a56cb2a4df0b6c..01cd977eb55ea386659e885db1519bfbb8f95730 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -3973,7 +3973,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;
                        /*
@@ -4009,12 +4009,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) {
@@ -4033,7 +4033,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 =
@@ -4043,7 +4043,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);
                        }
                }
@@ -4058,7 +4058,7 @@ out:
 
        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 f45759b353bea7b11e324b47ca88df900831e7c8..e5c86c873e9524031b922f865cd2b29f9617986d 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1573,7 +1573,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) {