Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb873ba4 authored Aug 31, 2018 by Quinn Tran Committed by Martin K. Petersen Sep 11, 2018

scsi: qla2xxx: Update rscn_rcvd field to more meaningful scan_needed



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>

parent 49cecca7

drivers/scsi/qla2xxx/qla_def.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/scsi/qla2xxx/qla_gs.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -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;

drivers/scsi/qla2xxx/qla_init.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {