summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/ulp/iser/iscsi_iser.h
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2008-05-21 15:54:08 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-07-12 08:22:19 -0500
commit2747fdb25726caa1a89229f43d99ca50af72576a (patch)
tree77e2da2ba710cb09f8e9ee4564a75ba6bb17bd5e /drivers/infiniband/ulp/iser/iscsi_iser.h
parentfbc514b4e262bc0596faae8640ebc0b9142a1cdd (diff)
downloadlinux-2747fdb25726caa1a89229f43d99ca50af72576a.tar.gz
linux-2747fdb25726caa1a89229f43d99ca50af72576a.tar.bz2
linux-2747fdb25726caa1a89229f43d99ca50af72576a.zip
[SCSI] iser: convert ib_iser to support merged tasks
Convert ib_iser to support merged tasks. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/infiniband/ulp/iser/iscsi_iser.h')
-rw-r--r--drivers/infiniband/ulp/iser/iscsi_iser.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index bd5c1a554ea6..96a600f127c8 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -298,15 +298,15 @@ extern int iser_debug_level;
/* allocate connection resources needed for rdma functionality */
int iser_conn_set_full_featured_mode(struct iscsi_conn *conn);
-int iser_send_control(struct iscsi_conn *conn,
- struct iscsi_mgmt_task *mtask);
+int iser_send_control(struct iscsi_conn *conn,
+ struct iscsi_cmd_task *ctask);
-int iser_send_command(struct iscsi_conn *conn,
- struct iscsi_cmd_task *ctask);
+int iser_send_command(struct iscsi_conn *conn,
+ struct iscsi_cmd_task *ctask);
-int iser_send_data_out(struct iscsi_conn *conn,
+int iser_send_data_out(struct iscsi_conn *conn,
struct iscsi_cmd_task *ctask,
- struct iscsi_data *hdr);
+ struct iscsi_data *hdr);
void iscsi_iser_recv(struct iscsi_conn *conn,
struct iscsi_hdr *hdr,
@@ -326,7 +326,7 @@ void iser_rcv_completion(struct iser_desc *desc,
void iser_snd_completion(struct iser_desc *desc);
-void iser_ctask_rdma_init(struct iscsi_iser_cmd_task *ctask);
+void iser_ctask_rdma_init(struct iscsi_iser_cmd_task *ctask);
void iser_ctask_rdma_finalize(struct iscsi_iser_cmd_task *ctask);