[12/13] Revert "UBUNTU: SAUCE: Guest OS does not recognize a lun with non zero target id on Vmware ESX Server"

Submitted by Leann Ogasawara on May 21, 2010, 11:18 p.m.

Details

Message ID 1274483919.19284.3337.camel@emiko
State Accepted
Delegated to: Leann Ogasawara
Headers show

Commit Message

Leann Ogasawara May 21, 2010, 11:18 p.m.
>From bc35100527798f435d9765bd3885ae7b96f4acfb Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Fri, 21 May 2010 15:15:47 -0700
Subject: [PATCH 12/13] Revert "UBUNTU: SAUCE: Guest OS does not recognize a lun with non zero target id on Vmware ESX Server"

This reverts commit 0a64e1866f999a1a10edd10eb4e929936fa26864.

This is an ancient patch we've been carrying from release to release.
It's believed it is only required with very old vmware.  Lets drop it for
Maverick and see who screams.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 drivers/message/fusion/mptbase.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 9de2227..5382b5a 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -3233,16 +3233,6 @@  GetPortFacts(MPT_ADAPTER *ioc, int portnum, int sleepFlag)
 	pfacts->IOCStatus = le16_to_cpu(pfacts->IOCStatus);
 	pfacts->IOCLogInfo = le32_to_cpu(pfacts->IOCLogInfo);
 	pfacts->MaxDevices = le16_to_cpu(pfacts->MaxDevices);
-	/*
-	 * VMware emulation is broken, its PortFact's MaxDevices reports value
-	 * programmed by IOC Init, so if you program IOC Init to 256 (which is 0,
-	 * as that field is only 8 bit), it reports back 0 in port facts, instead
-	 * of 256...  And unfortunately using 256 triggers another bug in the
-	 * code (parallel SCSI can have only 16 devices).
-	 */
-	if (pfacts->MaxDevices == 0) {
-	   pfacts->MaxDevices = 16;
-	}
 	pfacts->PortSCSIID = le16_to_cpu(pfacts->PortSCSIID);
 	pfacts->ProtocolFlags = le16_to_cpu(pfacts->ProtocolFlags);
 	pfacts->MaxPostedCmdBuffers = le16_to_cpu(pfacts->MaxPostedCmdBuffers);