Commit fd0e7e4d authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley

[SCSI] qla2xxx: Correct endianess comparisons during ISP24xx NVRAM configuration.

Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent ffb39f03
...@@ -3371,7 +3371,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha) ...@@ -3371,7 +3371,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
strcpy(ha->model_number, "QLA2462"); strcpy(ha->model_number, "QLA2462");
/* Prepare nodename */ /* Prepare nodename */
if ((icb->firmware_options_1 & BIT_14) == 0) { if ((icb->firmware_options_1 & __constant_cpu_to_le32(BIT_14)) == 0) {
/* /*
* Firmware will apply the following mask if the nodename was * Firmware will apply the following mask if the nodename was
* not provided. * not provided.
...@@ -3387,8 +3387,8 @@ qla24xx_nvram_config(scsi_qla_host_t *ha) ...@@ -3387,8 +3387,8 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
ha->flags.enable_target_reset = 1; ha->flags.enable_target_reset = 1;
ha->flags.enable_led_scheme = 0; ha->flags.enable_led_scheme = 0;
ha->operating_mode = ha->operating_mode = (le32_to_cpu(icb->firmware_options_2) &
(icb->firmware_options_2 & (BIT_6 | BIT_5 | BIT_4)) >> 4; (BIT_6 | BIT_5 | BIT_4)) >> 4;
memcpy(ha->fw_seriallink_options24, nv->seriallink_options, memcpy(ha->fw_seriallink_options24, nv->seriallink_options,
sizeof(ha->fw_seriallink_options24)); sizeof(ha->fw_seriallink_options24));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment