diff options
| author | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 16:33:43 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 16:33:43 -0400 |
| commit | c9802cd9574a80444e689c7525627b40d7dc3a06 (patch) | |
| tree | 5954e2ac7e97023b51d36127963a1e9262fbcfe0 /drivers/infiniband/ulp/iser/iscsi_iser.h | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) | |
| parent | 2d2f8d59b14bec6c745e219a350ac51d9e00673f (diff) | |
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>
Diffstat (limited to 'drivers/infiniband/ulp/iser/iscsi_iser.h')
| -rw-r--r-- | drivers/infiniband/ulp/iser/iscsi_iser.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h index 7e1a411db2a3..2cf9ae0def1c 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 { | |||
| 262 | struct iscsi_iser_cmd_task { | 262 | struct iscsi_iser_cmd_task { |
| 263 | struct iser_desc desc; | 263 | struct iser_desc desc; |
| 264 | struct iscsi_iser_conn *iser_conn; | 264 | struct iscsi_iser_conn *iser_conn; |
| 265 | int rdma_data_count;/* RDMA bytes */ | ||
| 266 | enum iser_task_status status; | 265 | enum iser_task_status status; |
| 267 | int command_sent; /* set if command sent */ | 266 | int command_sent; /* set if command sent */ |
| 268 | int dir[ISER_DIRS_NUM]; /* set if dir use*/ | 267 | int dir[ISER_DIRS_NUM]; /* set if dir use*/ |