From 9b63bc064b619c1aeee8b215fdcc8fbaa4ad4624 Mon Sep 17 00:00:00 2001
From: "Martin K. Petersen" <martin.petersen@oracle.com>
Date: Wed, 18 May 2011 00:45:22 -0400
Subject: [PATCH] --- yaml --- r: 252431 b: refs/heads/master c:
 756aca7edd37611b73e1e86ea64a67b62d251509 h: refs/heads/master i:   252429:
 28ca5441ea95e06f9d85e4bc47b720cd45ebf16f   252427:
 ec5df818bf300ad0d6a181fb89eec34d62b691fe   252423:
 44cc1ee569d7b5054b9cf011e7c3ce8cef2d691c   252415:
 e5875fedb346d082f3b83c05ffb4745810dcb7f0 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 92de8255c4c6..5f9091a3a955 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a8cfad06ebbb68e8c113a39bdd653297fb9369c
+refs/heads/master: 756aca7edd37611b73e1e86ea64a67b62d251509
diff --git a/trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index e97363c75074..a7dbc6825f5f 100644
--- a/trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -3502,6 +3502,7 @@ _scsih_setup_eedp(struct scsi_cmnd *scmd, Mpi2SCSIIORequest_t *mpi_request)
 
 	switch (prot_type) {
 	case SCSI_PROT_DIF_TYPE1:
+	case SCSI_PROT_DIF_TYPE2:
 
 		/*
 		* enable ref/guard checking
@@ -3514,13 +3515,6 @@ _scsih_setup_eedp(struct scsi_cmnd *scmd, Mpi2SCSIIORequest_t *mpi_request)
 		    cpu_to_be32(scsi_get_lba(scmd));
 		break;
 
-	case SCSI_PROT_DIF_TYPE2:
-
-		eedp_flags |= MPI2_SCSIIO_EEDPFLAGS_INC_PRI_REFTAG |
-		    MPI2_SCSIIO_EEDPFLAGS_CHECK_REFTAG |
-		    MPI2_SCSIIO_EEDPFLAGS_CHECK_GUARD;
-		break;
-
 	case SCSI_PROT_DIF_TYPE3:
 
 		/*