summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx
diff options
context:
space:
mode:
authorAndrew Vasquez <andrew.vasquez@qlogic.com>2006-05-18 00:09:16 +0200
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-05-20 16:42:43 +0200
commit5341e868fb2e98090a68860a35bf4c11d7f8e5da (patch)
treedb31c8e430368bb7198c6c673c2c7c89e3b862bc /drivers/scsi/qla2xxx
parent[SCSI] qla2xxx: Correct endianess comparisons during ISP24xx NVRAM configurat... (diff)
downloadlinux-5341e868fb2e98090a68860a35bf4c11d7f8e5da.tar.xz
linux-5341e868fb2e98090a68860a35bf4c11d7f8e5da.zip
[SCSI] qla2xxx: Add support for alternate WWN NVRAM setting.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla2xxx')
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 7a5d52f23f53..b1b20f43d722 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1532,6 +1532,12 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
while (cnt--)
*dptr1++ = *dptr2++;
+ /* Use alternate WWN? */
+ if (nv->host_p[1] & BIT_7) {
+ memcpy(icb->node_name, nv->alternate_node_name, WWN_SIZE);
+ memcpy(icb->port_name, nv->alternate_port_name, WWN_SIZE);
+ }
+
/* Prepare nodename */
if ((icb->firmware_options[1] & BIT_6) == 0) {
/*
@@ -3370,6 +3376,12 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
} else
strcpy(ha->model_number, "QLA2462");
+ /* Use alternate WWN? */
+ if (nv->host_p & __constant_cpu_to_le32(BIT_15)) {
+ memcpy(icb->node_name, nv->alternate_node_name, WWN_SIZE);
+ memcpy(icb->port_name, nv->alternate_port_name, WWN_SIZE);
+ }
+
/* Prepare nodename */
if ((icb->firmware_options_1 & __constant_cpu_to_le32(BIT_14)) == 0) {
/*