[SCSI] qla2xxx: Reference proper node/port names in fc_host class.

The initial-control-block references are not always correct
as the use-node-name qualifier during NVRAM configuration
will cause the firmware to use the portname as a base for
the nodename.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 2efca52dff50c45629b82c6a9d3c3a2ea137d497..b17ee62dd1a9ce67981d5bfc4ebf6ce2e7596898 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -541,7 +541,7 @@ struct fc_function_template qla2xxx_transport_functions = {
 void
 qla2x00_init_host_attr(scsi_qla_host_t *ha)
 {
-       fc_host_node_name(ha->host) = wwn_to_u64(ha->init_cb->node_name);
-       fc_host_port_name(ha->host) = wwn_to_u64(ha->init_cb->port_name);
+       fc_host_node_name(ha->host) = wwn_to_u64(ha->node_name);
+       fc_host_port_name(ha->host) = wwn_to_u64(ha->port_name);
        fc_host_supported_classes(ha->host) = FC_COS_CLASS3;
 }