Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5341e868 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Add support for alternate WWN NVRAM setting. 



Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent fd0e7e4d

drivers/scsi/qla2xxx/qla_init.c

+12 −0
Original line number Diff line number Diff line
@@ -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) {

		/*