summaryrefslogtreecommitdiff
path: root/drivers/scsi/iscsi_tcp.h
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2006-09-01 02:09:28 +0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-09-02 22:37:18 +0400
commitdd8c0d958621e3137f3e3302f7b8952041a4a1d7 (patch)
tree30b943eebcc044cb3305c449d7eea00376115a22 /drivers/scsi/iscsi_tcp.h
parent62f383003c22cd34920d0412465eddcb1223da0d (diff)
downloadlinux-dd8c0d958621e3137f3e3302f7b8952041a4a1d7.tar.xz
[SCSI] scsi_tcp: rm data rx and tx tfms
We currently allocated seperate tfms for data and header digests. There is no reason for this since we can never calculate a rx header and digest at the same time. Same for sends. So this patch removes the data tfms and has the send and recv sides use the rx_tfm or tx_tfm. I also made the connection creation code preallocate the tfms because I thought I hit a bug where I changed the digests settings during a relogin but could not allocate the tfm and then we just failed. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/iscsi_tcp.h')
-rw-r--r--drivers/scsi/iscsi_tcp.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/scsi/iscsi_tcp.h b/drivers/scsi/iscsi_tcp.h
index 7e40e94d9fdc..609f4778d125 100644
--- a/drivers/scsi/iscsi_tcp.h
+++ b/drivers/scsi/iscsi_tcp.h
@@ -81,10 +81,6 @@ struct iscsi_tcp_conn {
* stop to terminate */
/* iSCSI connection-wide sequencing */
int hdr_size; /* PDU header size */
-
- struct crypto_tfm *rx_tfm; /* CRC32C (Rx) */
- struct crypto_tfm *data_rx_tfm; /* CRC32C (Rx) for data */
-
/* control data */
struct iscsi_tcp_recv in; /* TCP receive context */
int in_progress; /* connection state machine */
@@ -94,9 +90,9 @@ struct iscsi_tcp_conn {
void (*old_state_change)(struct sock *);
void (*old_write_space)(struct sock *);
- /* xmit */
+ /* data and header digests */
struct crypto_tfm *tx_tfm; /* CRC32C (Tx) */
- struct crypto_tfm *data_tx_tfm; /* CRC32C (Tx) for data */
+ struct crypto_tfm *rx_tfm; /* CRC32C (Rx) */
/* MIB custom statistics */
uint32_t sendpage_failures_cnt;