From 3a5280c38deee80e1e085bcee25c1fd0bd47f54e Mon Sep 17 00:00:00 2001
From: "Moore, Eric" <Eric.Moore@lsil.com>
Date: Thu, 2 Feb 2006 17:19:30 -0700
Subject: [PATCH] --- yaml --- r: 20383 b: refs/heads/master c:
 096f7a2a094af3007937d6fd21560e28dca0994d h: refs/heads/master i:   20381:
 bb4d1b62099167a84847d853346adb796b40349f   20379:
 6a9d75bf44d8dfb0e6406a8d7344698f7c276a05   20375:
 b2cb0191d8ea540911c276a1d583bc84f30a061b   20367:
 2a7cc7cb2273e7e16aa72007fffefdbdbba8369b   20351:
 090d2acc2429d87dad88707f267d83e4319f40d6 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/message/fusion/mptctl.c | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 555afd2f93bc..cf4abc711868 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5b81016538cf84a10c80438b7aa750dd375ba93
+refs/heads/master: 096f7a2a094af3007937d6fd21560e28dca0994d
diff --git a/trunk/drivers/message/fusion/mptctl.c b/trunk/drivers/message/fusion/mptctl.c
index bdf709987982..70a812a2514d 100644
--- a/trunk/drivers/message/fusion/mptctl.c
+++ b/trunk/drivers/message/fusion/mptctl.c
@@ -1817,6 +1817,8 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr)
 	case MPI_FUNCTION_SCSI_ENCLOSURE_PROCESSOR:
 	case MPI_FUNCTION_FW_DOWNLOAD:
 	case MPI_FUNCTION_FC_PRIMITIVE_SEND:
+	case MPI_FUNCTION_TOOLBOX:
+	case MPI_FUNCTION_SAS_IO_UNIT_CONTROL:
 		break;
 
 	case MPI_FUNCTION_SCSI_IO_REQUEST:
@@ -1888,6 +1890,25 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr)
 		}
 		break;
 
+	case MPI_FUNCTION_SMP_PASSTHROUGH:
+		/* Check mf->PassthruFlags to determine if
+		 * transfer is ImmediateMode or not.
+		 * Immediate mode returns data in the ReplyFrame.
+		 * Else, we are sending request and response data
+		 * in two SGLs at the end of the mf.
+		 */
+		break;
+
+	case MPI_FUNCTION_SATA_PASSTHROUGH:
+		if (!ioc->sh) {
+			printk(KERN_ERR "%s@%d::mptctl_do_mpt_command - "
+				"SCSI driver is not loaded. \n",
+					__FILE__, __LINE__);
+			rc = -EFAULT;
+			goto done_free_mem;
+		}
+		break;
+
 	case MPI_FUNCTION_RAID_ACTION:
 		/* Just add a SGE
 		 */