diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
| commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
| tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /include/scsi/iscsi_proto.h | |
| parent | a300bec952127d9a15e666b391bb35c9aecb3002 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'include/scsi/iscsi_proto.h')
| -rw-r--r-- | include/scsi/iscsi_proto.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/scsi/iscsi_proto.h b/include/scsi/iscsi_proto.h index e0593bfae622..f2a2c1169486 100644 --- a/include/scsi/iscsi_proto.h +++ b/include/scsi/iscsi_proto.h | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #define ISCSI_PROTO_H | 22 | #define ISCSI_PROTO_H |
| 23 | 23 | ||
| 24 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 25 | #include <scsi/scsi.h> | ||
| 25 | 26 | ||
| 26 | #define ISCSI_DRAFT20_VERSION 0x00 | 27 | #define ISCSI_DRAFT20_VERSION 0x00 |
| 27 | 28 | ||
| @@ -156,7 +157,7 @@ struct iscsi_ecdb_ahdr { | |||
| 156 | uint8_t ahstype; | 157 | uint8_t ahstype; |
| 157 | uint8_t reserved; | 158 | uint8_t reserved; |
| 158 | /* 4-byte aligned extended CDB spillover */ | 159 | /* 4-byte aligned extended CDB spillover */ |
| 159 | uint8_t ecdb[260 - ISCSI_CDB_SIZE]; | 160 | uint8_t ecdb[SCSI_MAX_VARLEN_CDB_SIZE - ISCSI_CDB_SIZE]; |
| 160 | }; | 161 | }; |
| 161 | 162 | ||
| 162 | /* SCSI Response Header */ | 163 | /* SCSI Response Header */ |