diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2007-09-29 04:24:44 -0500 |
|---|---|---|
| committer | Mike Christie <michaelc@cs.wisc.edu> | 2007-09-29 04:56:27 -0500 |
| commit | b5bcd242ab995f92ebcb03ed672a3d2563506ec2 (patch) | |
| tree | 63c5780fc6f373c51b48d9a4fd4961412873120c /include | |
| parent | 3f5f9bd3fcd4c61f64d39c22142d69bbe47e4094 (diff) | |
| download | open-iscsi-b5bcd242ab995f92ebcb03ed672a3d2563506ec2.tar.gz | |
sync with upstream
Recv and xmit rewrite.
Diffstat (limited to 'include')
| -rw-r--r-- | include/iscsi_if.h | 3 | ||||
| -rw-r--r-- | include/iscsi_proto.h | 12 |
2 files changed, 13 insertions, 2 deletions
diff --git a/include/iscsi_if.h b/include/iscsi_if.h index dff4f29..7ad582e 100644 --- a/include/iscsi_if.h +++ b/include/iscsi_if.h @@ -21,7 +21,7 @@ #ifndef ISCSI_IF_H #define ISCSI_IF_H -#include <iscsi_proto.h> +#include "iscsi_proto.h" #define UEVENT_BASE 10 #define KEVENT_BASE 100 @@ -331,6 +331,7 @@ enum iscsi_host_param { * These flags describes reason of stop_conn() call */ #define STOP_CONN_TERM 0x1 +#define STOP_CONN_SUSPEND 0x2 #define STOP_CONN_RECOVER 0x3 #define ISCSI_STATS_CUSTOM_MAX 32 diff --git a/include/iscsi_proto.h b/include/iscsi_proto.h index e821932..6256e37 100644 --- a/include/iscsi_proto.h +++ b/include/iscsi_proto.h @@ -21,13 +21,15 @@ #ifndef ISCSI_PROTO_H #define ISCSI_PROTO_H +#include <linux/types.h> + #define ISCSI_DRAFT20_VERSION 0x00 /* default iSCSI listen port for incoming connections */ #define ISCSI_LISTEN_PORT 3260 /* Padding word length */ -#define PAD_WORD_LEN 4 +#define ISCSI_PAD_LEN 4 /* * useful common(control and data pathes) macro @@ -162,6 +164,14 @@ struct iscsi_rlength_ahdr { __be32 read_length; }; +/* Extended CDB AHS */ +struct iscsi_ecdb_ahdr { + __be16 ahslength; /* CDB length - 15, including reserved byte */ + uint8_t ahstype; + uint8_t reserved; + uint8_t ecdb[260 - 16]; /* 4-byte aligned extended CDB spillover */ +}; + /* SCSI Response Header */ struct iscsi_cmd_rsp { uint8_t opcode; |