summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx
diff options
context:
space:
mode:
authorGiridhar Malavali <giridhar.malavali@qlogic.com>2010-09-03 15:20:51 -0700
committerJames Bottomley <James.Bottomley@suse.de>2010-09-05 15:34:56 -0300
commit35e0cbd4b282e541d05ca21694beb26c087bb49e (patch)
tree335801cb54d58e88f6286b6e20b355c9b017762c /drivers/scsi/qla2xxx
parenta5b36321918b3a1295748b77c62976c167233eec (diff)
downloadlinux-stable-35e0cbd4b282e541d05ca21694beb26c087bb49e.tar.gz
linux-stable-35e0cbd4b282e541d05ca21694beb26c087bb49e.tar.bz2
linux-stable-35e0cbd4b282e541d05ca21694beb26c087bb49e.zip
[SCSI] qla2xxx: Return proper fabric name based on device state.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/qla2xxx')
-rw-r--r--drivers/scsi/qla2xxx/qla_attr.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 679a4326811c..560641aa3a5c 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -1685,14 +1685,14 @@ static void
qla2x00_get_host_fabric_name(struct Scsi_Host *shost)
{
scsi_qla_host_t *vha = shost_priv(shost);
- u64 node_name;
+ uint8_t node_name[WWN_SIZE] = { 0xFF, 0xFF, 0xFF, 0xFF, \
+ 0xFF, 0xFF, 0xFF, 0xFF};
+ u64 fabric_name = wwn_to_u64(node_name);
if (vha->device_flags & SWITCH_FOUND)
- node_name = wwn_to_u64(vha->fabric_node_name);
- else
- node_name = wwn_to_u64(vha->node_name);
+ fabric_name = wwn_to_u64(vha->fabric_node_name);
- fc_host_fabric_name(shost) = node_name;
+ fc_host_fabric_name(shost) = fabric_name;
}
static void