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

Commit 85821c90 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Set an rport's dev_loss_tmo value in a consistent manner. 



As there's no point in adding a fixed-fudge value (originally 5
seconds), honor the user settings only.  We also remove the
driver's dead-callback get_rport_dev_loss_tmo function
(qla2x00_get_rport_loss_tmo()).

Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 5f3a9a20

drivers/scsi/qla2xxx/qla_attr.c

+2 −18
Original line number Diff line number Diff line
@@ -971,27 +971,13 @@ qla2x00_get_starget_port_id(struct scsi_target *starget) 
	fc_starget_port_id(starget) = port_id;

}



static void

qla2x00_get_rport_loss_tmo(struct fc_rport *rport)

{

	struct Scsi_Host *host = rport_to_shost(rport);

	scsi_qla_host_t *ha = shost_priv(host);



	rport->dev_loss_tmo = ha->port_down_retry_count + 5;

}



static void

qla2x00_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)

{

	struct Scsi_Host *host = rport_to_shost(rport);

	scsi_qla_host_t *ha = shost_priv(host);



	if (timeout)

		ha->port_down_retry_count = timeout;

		rport->dev_loss_tmo = timeout;

	else

		ha->port_down_retry_count = 1;



	rport->dev_loss_tmo = ha->port_down_retry_count + 5;

		rport->dev_loss_tmo = 1;

}



static void
@@ -1275,7 +1261,6 @@ struct fc_function_template qla2xxx_transport_functions = { 
	.get_starget_port_id  = qla2x00_get_starget_port_id,

	.show_starget_port_id = 1,



	.get_rport_dev_loss_tmo = qla2x00_get_rport_loss_tmo,

	.set_rport_dev_loss_tmo = qla2x00_set_rport_loss_tmo,

	.show_rport_dev_loss_tmo = 1,
@@ -1320,7 +1305,6 @@ struct fc_function_template qla2xxx_transport_vport_functions = { 
	.get_starget_port_id  = qla2x00_get_starget_port_id,

	.show_starget_port_id = 1,



	.get_rport_dev_loss_tmo = qla2x00_get_rport_loss_tmo,

	.set_rport_dev_loss_tmo = qla2x00_set_rport_loss_tmo,

	.show_rport_dev_loss_tmo = 1,

drivers/scsi/qla2xxx/qla_os.c

+1 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ qla2xxx_slave_configure(struct scsi_device *sdev) 
	else

		scsi_deactivate_tcq(sdev, ha->max_q_depth);



	rport->dev_loss_tmo = ha->port_down_retry_count + 5;

	rport->dev_loss_tmo = ha->port_down_retry_count;



	return 0;

}