aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Vasquez <andrew.vasquez@qlogic.com>2006-05-17 18:09:16 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-05-20 10:42:43 -0400
commit5341e868fb2e98090a68860a35bf4c11d7f8e5da (patch)
treedb31c8e430368bb7198c6c673c2c7c89e3b862bc
parentfd0e7e4dd507cd21d714d34a1cc1a620d01e9772 (diff)
[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>
-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)
1532 while (cnt--) 1532 while (cnt--)
1533 *dptr1++ = *dptr2++; 1533 *dptr1++ = *dptr2++;
1534 1534
1535 /* Use alternate WWN? */
1536 if (nv->host_p[1] & BIT_7) {
1537 memcpy(icb->node_name, nv->alternate_node_name, WWN_SIZE);
1538 memcpy(icb->port_name, nv->alternate_port_name, WWN_SIZE);
1539 }
1540
1535 /* Prepare nodename */ 1541 /* Prepare nodename */
1536 if ((icb->firmware_options[1] & BIT_6) == 0) { 1542 if ((icb->firmware_options[1] & BIT_6) == 0) {
1537 /* 1543 /*
@@ -3370,6 +3376,12 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
3370 } else 3376 } else
3371 strcpy(ha->model_number, "QLA2462"); 3377 strcpy(ha->model_number, "QLA2462");
3372 3378
3379 /* Use alternate WWN? */
3380 if (nv->host_p & __constant_cpu_to_le32(BIT_15)) {
3381 memcpy(icb->node_name, nv->alternate_node_name, WWN_SIZE);
3382 memcpy(icb->port_name, nv->alternate_port_name, WWN_SIZE);
3383 }
3384
3373 /* Prepare nodename */ 3385 /* Prepare nodename */
3374 if ((icb->firmware_options_1 & __constant_cpu_to_le32(BIT_14)) == 0) { 3386 if ((icb->firmware_options_1 & __constant_cpu_to_le32(BIT_14)) == 0) {
3375 /* 3387 /*