Commit d2b5f10e authored by Mike Christie's avatar Mike Christie Committed by James Bottomley

[SCSI] qla2xxx: prep for fc host dev loss tmo support

This removes the driver's get_host_def_dev_loss_tmo
callback and just has the driver set the dev loss
using the fc class fc_host_dev_loss_tmo macro like is
done for other fc params.
Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Acked-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent a5110f29
...@@ -1529,15 +1529,6 @@ qla2x00_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout) ...@@ -1529,15 +1529,6 @@ qla2x00_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)
rport->dev_loss_tmo = 1; rport->dev_loss_tmo = 1;
} }
static void
qla2x00_get_host_def_loss_tmo(struct Scsi_Host *shost)
{
scsi_qla_host_t *vha = shost_priv(shost);
struct qla_hw_data *ha = vha->hw;
fc_host_def_dev_loss_tmo(shost) = ha->port_down_retry_count;
}
static void static void
qla2x00_dev_loss_tmo_callbk(struct fc_rport *rport) qla2x00_dev_loss_tmo_callbk(struct fc_rport *rport)
{ {
...@@ -1785,6 +1776,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable) ...@@ -1785,6 +1776,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
} }
/* initialize attributes */ /* initialize attributes */
fc_host_dev_loss_tmo(vha->host) = ha->port_down_retry_count;
fc_host_node_name(vha->host) = wwn_to_u64(vha->node_name); fc_host_node_name(vha->host) = wwn_to_u64(vha->node_name);
fc_host_port_name(vha->host) = wwn_to_u64(vha->port_name); fc_host_port_name(vha->host) = wwn_to_u64(vha->port_name);
fc_host_supported_classes(vha->host) = fc_host_supported_classes(vha->host) =
...@@ -1912,7 +1904,6 @@ struct fc_function_template qla2xxx_transport_functions = { ...@@ -1912,7 +1904,6 @@ struct fc_function_template qla2xxx_transport_functions = {
.show_host_fabric_name = 1, .show_host_fabric_name = 1,
.get_host_port_state = qla2x00_get_host_port_state, .get_host_port_state = qla2x00_get_host_port_state,
.show_host_port_state = 1, .show_host_port_state = 1,
.get_host_def_dev_loss_tmo = qla2x00_get_host_def_loss_tmo,
.dd_fcrport_size = sizeof(struct fc_port *), .dd_fcrport_size = sizeof(struct fc_port *),
.show_rport_supported_classes = 1, .show_rport_supported_classes = 1,
...@@ -1959,7 +1950,6 @@ struct fc_function_template qla2xxx_transport_vport_functions = { ...@@ -1959,7 +1950,6 @@ struct fc_function_template qla2xxx_transport_vport_functions = {
.show_host_fabric_name = 1, .show_host_fabric_name = 1,
.get_host_port_state = qla2x00_get_host_port_state, .get_host_port_state = qla2x00_get_host_port_state,
.show_host_port_state = 1, .show_host_port_state = 1,
.get_host_def_dev_loss_tmo = qla2x00_get_host_def_loss_tmo,
.dd_fcrport_size = sizeof(struct fc_port *), .dd_fcrport_size = sizeof(struct fc_port *),
.show_rport_supported_classes = 1, .show_rport_supported_classes = 1,
...@@ -1988,6 +1978,7 @@ qla2x00_init_host_attr(scsi_qla_host_t *vha) ...@@ -1988,6 +1978,7 @@ qla2x00_init_host_attr(scsi_qla_host_t *vha)
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
u32 speed = FC_PORTSPEED_UNKNOWN; u32 speed = FC_PORTSPEED_UNKNOWN;
fc_host_dev_loss_tmo(vha->host) = ha->port_down_retry_count;
fc_host_node_name(vha->host) = wwn_to_u64(vha->node_name); fc_host_node_name(vha->host) = wwn_to_u64(vha->node_name);
fc_host_port_name(vha->host) = wwn_to_u64(vha->port_name); fc_host_port_name(vha->host) = wwn_to_u64(vha->port_name);
fc_host_supported_classes(vha->host) = FC_COS_CLASS3; fc_host_supported_classes(vha->host) = FC_COS_CLASS3;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment