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

Commit 26a077e7 authored by Adam Radford's avatar Adam Radford Committed by James Bottomley
Browse files

[SCSI] megaraid_sas: Load correct raid context timeout 



The following patch for megaraid_sas loads the correct raid context timeout
value for multpathing and clustering.

Signed-off-by: default avatarAdam Radford <aradford@gmail.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 8058a169

drivers/scsi/megaraid/megaraid_sas_fp.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -975,7 +975,10 @@ MR_BuildRaidContext(struct megasas_instance *instance, 
			regSize += stripSize;

			regSize += stripSize;

	}

	}





	pRAID_Context->timeoutValue     = cpu_to_le16(map->raidMap.fpPdIoTimeoutSec);

	pRAID_Context->timeoutValue =

		cpu_to_le16(raid->fpIoTimeoutForLd ?

			    raid->fpIoTimeoutForLd :

			    map->raidMap.fpPdIoTimeoutSec);

	if ((instance->pdev->device == PCI_DEVICE_ID_LSI_INVADER) ||

	if ((instance->pdev->device == PCI_DEVICE_ID_LSI_INVADER) ||

		(instance->pdev->device == PCI_DEVICE_ID_LSI_FURY))

		(instance->pdev->device == PCI_DEVICE_ID_LSI_FURY))

		pRAID_Context->regLockFlags = (isRead) ?

		pRAID_Context->regLockFlags = (isRead) ?