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

Commit 06c22bd1 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Correct LED scheme definition. 



Original implementation used an overloaded bit in the EFI
parameters.  The correct bit is BIT_4 of the special_options
section of NVRAM.

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

drivers/scsi/qla2xxx/qla_def.h

+2 −2
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ typedef struct { 
	 * MSB BIT 1 =

	 * MSB BIT 2 =

	 * MSB BIT 3 =

	 * MSB BIT 4 =

	 * MSB BIT 4 = LED mode

	 * MSB BIT 5 = enable 50 ohm termination

	 * MSB BIT 6 = Data Rate (2300 only)

	 * MSB BIT 7 = Data Rate (2300 only)
@@ -1036,7 +1036,7 @@ typedef struct { 
	 * MSB BIT 1 =

	 * MSB BIT 2 =

	 * MSB BIT 3 =

	 * MSB BIT 4 =

	 * MSB BIT 4 = LED mode

	 * MSB BIT 5 = enable 50 ohm termination

	 * MSB BIT 6 = Data Rate (2300 only)

	 * MSB BIT 7 = Data Rate (2300 only)

drivers/scsi/qla2xxx/qla_init.c

+1 −1
Original line number Diff line number Diff line
@@ -1564,7 +1564,7 @@ qla2x00_nvram_config(scsi_qla_host_t *ha) 
	ha->flags.enable_lip_reset = ((nv->host_p[1] & BIT_1) ? 1 : 0);

	ha->flags.enable_lip_full_login = ((nv->host_p[1] & BIT_2) ? 1 : 0);

	ha->flags.enable_target_reset = ((nv->host_p[1] & BIT_3) ? 1 : 0);

	ha->flags.enable_led_scheme = ((nv->efi_parameters & BIT_3) ? 1 : 0);

	ha->flags.enable_led_scheme = (nv->special_options[1] & BIT_4) ? 1 : 0;



	ha->operating_mode =

	    (icb->add_firmware_options[0] & (BIT_6 | BIT_5 | BIT_4)) >> 4;