Merge remote-tracking branch 'block/for-next'

[karo-tx-linux.git] / include / scsi / libiscsi_tcp.h

diff --git a/include/scsi/libiscsi_tcp.h b/include/scsi/libiscsi_tcp.h
index 2a7aa75dd00926f6438197c5605553abcda8d4f3..30520d5ee3d14a576eb39ab852b1421d49a4c5b1 100644 (file)
--- a/include/scsi/libiscsi_tcp.h
+++ b/include/scsi/libiscsi_tcp.h
@@ -26,7 +26,7 @@
 struct iscsi_tcp_conn;
 struct iscsi_segment;
 struct sk_buff;
-struct hash_desc;
+struct ahash_request;
 
 typedef int iscsi_segment_done_fn_t(struct iscsi_tcp_conn *,
                                    struct iscsi_segment *);
@@ -38,7 +38,7 @@ struct iscsi_segment {
        unsigned int            total_size;
        unsigned int            total_copied;
 
-       struct hash_desc        *hash;
+       struct ahash_request    *hash;
        unsigned char           padbuf[ISCSI_PAD_LEN];
        unsigned char           recv_digest[ISCSI_DIGEST_SIZE];
        unsigned char           digest[ISCSI_DIGEST_SIZE];
@@ -73,7 +73,7 @@ struct iscsi_tcp_conn {
        /* control data */
        struct iscsi_tcp_recv   in;             /* TCP receive context */
        /* CRC32C (Rx) LLD should set this is they do not offload */
-       struct hash_desc        *rx_hash;
+       struct ahash_request    *rx_hash;
 };
 
 struct iscsi_tcp_task {
@@ -111,15 +111,16 @@ extern void iscsi_tcp_segment_unmap(struct iscsi_segment *segment);
 extern void iscsi_segment_init_linear(struct iscsi_segment *segment,
                                      void *data, size_t size,
                                      iscsi_segment_done_fn_t *done,
-                                     struct hash_desc *hash);
+                                     struct ahash_request *hash);
 extern int
 iscsi_segment_seek_sg(struct iscsi_segment *segment,
                      struct scatterlist *sg_list, unsigned int sg_count,
                      unsigned int offset, size_t size,
-                     iscsi_segment_done_fn_t *done, struct hash_desc *hash);
+                     iscsi_segment_done_fn_t *done,
+                     struct ahash_request *hash);
 
 /* digest helpers */
-extern void iscsi_tcp_dgst_header(struct hash_desc *hash, const void *hdr,
+extern void iscsi_tcp_dgst_header(struct ahash_request *hash, const void *hdr,
                                  size_t hdrlen,
                                  unsigned char digest[ISCSI_DIGEST_SIZE]);
 extern struct iscsi_cls_conn *