aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChad Dupuis <chad.dupuis@qlogic.com>2012-05-15 14:34:27 -0400
committerJames Bottomley <JBottomley@Parallels.com>2012-05-22 06:47:01 -0400
commit2c1391d395ef7ba9261b7dd590c5a195315631d6 (patch)
treeab3ca71436f37b2076939ffb2e6d800e93a03966
parent9bc3bf274676c9b7345bdd539245f7903a20995e (diff)
[SCSI] Revert "qla2xxx: During loopdown perform Diagnostic loopback."
commit 491118dff9aeb207408bd42aa4897bc2c145747f Author: Saurav Kashyap <saurav.kashyap@qlogic.com> Date: Tue Aug 16 11:31:50 2011 -0700 [SCSI] qla2xxx: During loopdown perform Diagnostic loopback. The LOOP_DOWN test is not needed. Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--drivers/scsi/qla2xxx/qla_bsg.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 449ac9c2b9c1..c68883806c54 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -708,7 +708,6 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
708 elreq.options = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1]; 708 elreq.options = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];
709 709
710 if ((ha->current_topology == ISP_CFG_F || 710 if ((ha->current_topology == ISP_CFG_F ||
711 (atomic_read(&vha->loop_state) == LOOP_DOWN) ||
712 ((IS_QLA81XX(ha) || IS_QLA8031(ha)) && 711 ((IS_QLA81XX(ha) || IS_QLA8031(ha)) &&
713 le32_to_cpu(*(uint32_t *)req_data) == ELS_OPCODE_BYTE 712 le32_to_cpu(*(uint32_t *)req_data) == ELS_OPCODE_BYTE
714 && req_data_len == MAX_ELS_FRAME_PAYLOAD)) && 713 && req_data_len == MAX_ELS_FRAME_PAYLOAD)) &&