From cedf31579e30c26b2bbb0fd47aa5f93be54527d8 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Fri, 12 Feb 2010 19:42:00 +0000
Subject: [PATCH] Removed handling of AESOLNT, CRSOLNT and LOSOLNT flags again.

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1504 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 srpt/src/ib_srpt.c | 21 ---------------------
 srpt/src/ib_srpt.h |  7 -------
 2 files changed, 28 deletions(-)

diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c
index 3ec3730e9..a120ba073 100644
--- a/srpt/src/ib_srpt.c
+++ b/srpt/src/ib_srpt.c
@@ -1193,14 +1193,6 @@ static int srpt_build_cmd_rsp(struct srpt_rdma_ch *ch,
 	memset(srp_rsp, 0, sizeof *srp_rsp);
 
 	srp_rsp->opcode = SRP_RSP;
-	/*
-	 * Copy the SCSOLNT or UCSOLNT bit from the request to the SOLNT bit
-	 * of the response.
-	 */
-	srp_rsp->sol_not
-		= (ioctx->sol_not
-		   & (status == SAM_STAT_GOOD ? SRP_SCSOLNT : SRP_UCSOLNT))
-		? SRP_SOLNT : 0;
 	srp_rsp->req_lim_delta = cpu_to_be32(req_lim_delta);
 	srp_rsp->tag = tag;
 
@@ -1252,15 +1244,6 @@ static int srpt_build_tskmgmt_rsp(struct srpt_rdma_ch *ch,
 	memset(srp_rsp, 0, sizeof *srp_rsp);
 
 	srp_rsp->opcode = SRP_RSP;
-	/*
-	 * Copy the SCSOLNT or UCSOLNT bit from the request to the SOLNT bit
-	 * of the response.
-	 */
-	srp_rsp->sol_not
-		= (ioctx->sol_not
-		   & (rsp_code == SRP_TSK_MGMT_SUCCESS
-		      ? SRP_SCSOLNT : SRP_UCSOLNT))
-		? SRP_SOLNT : 0;
 	srp_rsp->req_lim_delta = cpu_to_be32(req_lim_delta);
 	srp_rsp->tag = tag;
 
@@ -1484,7 +1467,6 @@ static void srpt_handle_new_iu(struct srpt_rdma_ch *ch,
 	ioctx->rdma_ius = NULL;
 	ioctx->scmnd = NULL;
 	ioctx->ch = ch;
-	ioctx->sol_not = srp_cmd->sol_not;
 	atomic_set(&ioctx->state, SRPT_STATE_NEW);
 
 	switch (srp_cmd->opcode) {
@@ -1940,9 +1922,6 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
 	memcpy(ch->i_port_id, req->initiator_port_id, 16);
 	memcpy(ch->t_port_id, req->target_port_id, 16);
 	ch->sport = &sdev->port[param->port - 1];
-	ch->losolnt = req->req_flags & SRP_LOSOLNT ? 1 : 0;
-	ch->crsolnt = req->req_flags & SRP_CRSOLNT ? 1 : 0;
-	ch->aesolnt = req->req_flags & SRP_AESOLNT ? 1 : 0;
 	ch->cm_id = cm_id;
 	atomic_set(&ch->state, RDMA_CHANNEL_CONNECTING);
 	INIT_LIST_HEAD(&ch->cmd_wait_list);
diff --git a/srpt/src/ib_srpt.h b/srpt/src/ib_srpt.h
index 8ca36cba6..66f7f48d4 100644
--- a/srpt/src/ib_srpt.h
+++ b/srpt/src/ib_srpt.h
@@ -163,7 +163,6 @@ struct srpt_ioctx {
 	u16 n_rdma_ius;
 	u8 n_rdma;
 	u8 n_rbuf;
-	u8 sol_not;
 
 	enum ib_wc_opcode op;
 	/* Node for insertion in the srpt_thread::thread_ioctx_list. */
@@ -188,12 +187,6 @@ enum rdma_ch_state {
 };
 
 struct srpt_rdma_ch {
-	/* AESOLNT flag from SRP_LOGIN_REQ. */
-	unsigned aesolnt:1;
-	/* CRSOLNT from SRP_LOGIN_REQ. */
-	unsigned crsolnt:1;
-	/* LOSOLNT flag from SRP_LOGIN_REQ. */
-	unsigned losolnt:1;
 	struct ib_cm_id *cm_id;
 	/* IB queue pair. */
 	struct ib_qp *qp;