1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/scsi/iscsi_tcp.h b/drivers/scsi/iscsi_tcp.h
index 32736831790e..7eba44df0a7f 100644
--- a/drivers/scsi/iscsi_tcp.h
+++ b/drivers/scsi/iscsi_tcp.h
@@ -29,11 +29,12 @@
 #define IN_PROGRESS_HEADER_GATHER       0x1
 #define IN_PROGRESS_DATA_RECV           0x2
 #define IN_PROGRESS_DDIGEST_RECV        0x3
+#define IN_PROGRESS_PAD_RECV            0x4
 
 /* xmit state machine */
 #define XMSTATE_IDLE                    0x0
-#define XMSTATE_R_HDR                   0x1
-#define XMSTATE_W_HDR                   0x2
+#define XMSTATE_CMD_HDR_INIT            0x1
+#define XMSTATE_CMD_HDR_XMIT            0x2
 #define XMSTATE_IMM_HDR                 0x4
 #define XMSTATE_IMM_DATA                0x8
 #define XMSTATE_UNS_INIT                0x10
@@ -44,6 +45,8 @@
 #define XMSTATE_W_PAD                   0x200
 #define XMSTATE_W_RESEND_PAD            0x400
 #define XMSTATE_W_RESEND_DATA_DIGEST    0x800
+#define XMSTATE_IMM_HDR_INIT            0x1000
+#define XMSTATE_SOL_HDR_INIT            0x2000
 
 #define ISCSI_PAD_LEN                   4
 #define ISCSI_SG_TABLESIZE              SG_ALL
@@ -152,7 +155,7 @@ struct iscsi_tcp_cmd_task {
         struct scatterlist      *sg;                    /* per-cmd SG list  */
         struct scatterlist      *bad_sg;                /* assert statement */
         int                     sg_count;               /* SG's to process  */
-        uint32_t                exp_r2tsn;
+        uint32_t                exp_datasn;             /* expected target's R2TSN/DataSN */
         int                     data_offset;
         struct iscsi_r2t_info   *r2t;                   /* in progress R2T    */
         struct iscsi_queue      r2tpool;