Merge mulgrave-w:git/scsi-misc-2.6

Conflicts:

	drivers/scsi/iscsi_tcp.c
	drivers/scsi/iscsi_tcp.h

Pretty horrible merge between crypto hash consolidation
and crypto_digest_...->crypto_hash_... conversion

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

2 files changed, 4 insertions, 15 deletions

diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index e9cf1a9f1e..2a14fe2e32 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -141,18 +141,11 @@ iscsi_iser_cmd_init(struct iscsi_cmd_task *ctask)
 
         if (sc->sc_data_direction == DMA_TO_DEVICE) {
                 BUG_ON(ctask->total_length == 0);
-                /* bytes to be sent via RDMA operations */
-                iser_ctask->rdma_data_count = ctask->total_length -
-                                         ctask->imm_count -
-                                         ctask->unsol_count;
 
-                debug_scsi("cmd [itt %x total %d imm %d unsol_data %d "
-                           "rdma_data %d]\n",
+                debug_scsi("cmd [itt %x total %d imm %d unsol_data %d\n",
                            ctask->itt, ctask->total_length, ctask->imm_count,
-                           ctask->unsol_count, iser_ctask->rdma_data_count);
-        } else
-                /* bytes to be sent via RDMA operations */
-                iser_ctask->rdma_data_count = ctask->total_length;
+                           ctask->unsol_count);
+        }
 
         iser_ctask_rdma_init(iser_ctask);
 }
@@ -196,13 +189,10 @@ iscsi_iser_ctask_xmit_unsol_data(struct iscsi_conn *conn,
 {
         struct iscsi_data  hdr;
         int error = 0;
-        struct iscsi_iser_cmd_task *iser_ctask = ctask->dd_data;
 
         /* Send data-out PDUs while there's still unsolicited data to send */
         while (ctask->unsol_count > 0) {
-                iscsi_prep_unsolicit_data_pdu(ctask, &hdr,
-                                              iser_ctask->rdma_data_count);
-
+                iscsi_prep_unsolicit_data_pdu(ctask, &hdr);
                 debug_scsi("Sending data-out: itt 0x%x, data count %d\n",
                            hdr.itt, ctask->data_count);
 
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index 7e1a411db2..2cf9ae0def 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -262,7 +262,6 @@ struct iscsi_iser_conn {
 struct iscsi_iser_cmd_task {
         struct iser_desc             desc;
         struct iscsi_iser_conn       *iser_conn;
-        int                          rdma_data_count;/* RDMA bytes           */
         enum iser_task_status        status;
         int                          command_sent;  /* set if command  sent  */
         int                          dir[ISER_DIRS_NUM];      /* set if dir use*/