1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/scsi/iscsi_tcp.h b/drivers/scsi/iscsi_tcp.h
index 68c36cc8997e..7eba44df0a7f 100644
--- a/drivers/scsi/iscsi_tcp.h
+++ b/drivers/scsi/iscsi_tcp.h
@@ -32,21 +32,21 @@
 #define IN_PROGRESS_PAD_RECV            0x4
 /* xmit state machine */
-#define XMSTATE_VALUE_IDLE                      0
+#define XMSTATE_IDLE                    0x0
-#define XMSTATE_BIT_CMD_HDR_INIT                0
+#define XMSTATE_CMD_HDR_INIT            0x1
-#define XMSTATE_BIT_CMD_HDR_XMIT                1
+#define XMSTATE_CMD_HDR_XMIT            0x2
-#define XMSTATE_BIT_IMM_HDR                     2
+#define XMSTATE_IMM_HDR                 0x4
-#define XMSTATE_BIT_IMM_DATA                    3
+#define XMSTATE_IMM_DATA                0x8
-#define XMSTATE_BIT_UNS_INIT                    4
+#define XMSTATE_UNS_INIT                0x10
-#define XMSTATE_BIT_UNS_HDR                     5
+#define XMSTATE_UNS_HDR                 0x20
-#define XMSTATE_BIT_UNS_DATA                    6
+#define XMSTATE_UNS_DATA                0x40
-#define XMSTATE_BIT_SOL_HDR                     7
+#define XMSTATE_SOL_HDR                 0x80
-#define XMSTATE_BIT_SOL_DATA                    8
+#define XMSTATE_SOL_DATA                0x100
-#define XMSTATE_BIT_W_PAD                       9
+#define XMSTATE_W_PAD                   0x200
-#define XMSTATE_BIT_W_RESEND_PAD                10
+#define XMSTATE_W_RESEND_PAD            0x400
-#define XMSTATE_BIT_W_RESEND_DATA_DIGEST        11
+#define XMSTATE_W_RESEND_DATA_DIGEST    0x800
-#define XMSTATE_BIT_IMM_HDR_INIT                12
+#define XMSTATE_IMM_HDR_INIT            0x1000
-#define XMSTATE_BIT_SOL_HDR_INIT                13
+#define XMSTATE_SOL_HDR_INIT            0x2000
 #define ISCSI_PAD_LEN                   4
 #define ISCSI_SG_TABLESIZE              SG_ALL
@@ -122,7 +122,7 @@ struct iscsi_data_task {
 struct iscsi_tcp_mgmt_task {
        struct iscsi_hdr        hdr;
        char                    hdrext[sizeof(__u32)]; /* Header-Digest */
-        unsigned long           xmstate;        /* mgmt xmit progress */
+        int                     xmstate;        /* mgmt xmit progress */
        struct iscsi_buf        headbuf;        /* header buffer */
        struct iscsi_buf        sendbuf;        /* in progress buffer */
        int                     sent;
@@ -150,7 +150,7 @@ struct iscsi_tcp_cmd_task {
        int                     pad_count;              /* padded bytes */
        struct iscsi_buf        headbuf;                /* header buf (xmit) */
        struct iscsi_buf        sendbuf;                /* in progress buffer*/
-        unsigned long           xmstate;                /* xmit xtate machine */
+        int                     xmstate;                /* xmit xtate machine */
        int                     sent;
        struct scatterlist      *sg;                    /* per-cmd SG list  */
        struct scatterlist      *bad_sg;                /* assert statement */

diff --git a/drivers/scsi/iscsi_tcp.h b/drivers/scsi/iscsi_tcp.h index 68c36cc8997e..7eba44df0a7f 100644 --- a/drivers/scsi/iscsi_tcp.h +++ b/drivers/scsi/iscsi_tcp.h
@@ -32,21 +32,21 @@
32	#define IN_PROGRESS_PAD_RECV 0x4	32	#define IN_PROGRESS_PAD_RECV 0x4
33		33
34	/* xmit state machine */	34	/* xmit state machine */
35	#define XMSTATE_VALUE_IDLE 0	35	#define XMSTATE_IDLE 0x0
36	#define XMSTATE_BIT_CMD_HDR_INIT 0	36	#define XMSTATE_CMD_HDR_INIT 0x1
37	#define XMSTATE_BIT_CMD_HDR_XMIT 1	37	#define XMSTATE_CMD_HDR_XMIT 0x2
38	#define XMSTATE_BIT_IMM_HDR 2	38	#define XMSTATE_IMM_HDR 0x4
39	#define XMSTATE_BIT_IMM_DATA 3	39	#define XMSTATE_IMM_DATA 0x8
40	#define XMSTATE_BIT_UNS_INIT 4	40	#define XMSTATE_UNS_INIT 0x10
41	#define XMSTATE_BIT_UNS_HDR 5	41	#define XMSTATE_UNS_HDR 0x20
42	#define XMSTATE_BIT_UNS_DATA 6	42	#define XMSTATE_UNS_DATA 0x40
43	#define XMSTATE_BIT_SOL_HDR 7	43	#define XMSTATE_SOL_HDR 0x80
44	#define XMSTATE_BIT_SOL_DATA 8	44	#define XMSTATE_SOL_DATA 0x100
45	#define XMSTATE_BIT_W_PAD 9	45	#define XMSTATE_W_PAD 0x200
46	#define XMSTATE_BIT_W_RESEND_PAD 10	46	#define XMSTATE_W_RESEND_PAD 0x400
47	#define XMSTATE_BIT_W_RESEND_DATA_DIGEST 11	47	#define XMSTATE_W_RESEND_DATA_DIGEST 0x800
48	#define XMSTATE_BIT_IMM_HDR_INIT 12	48	#define XMSTATE_IMM_HDR_INIT 0x1000
49	#define XMSTATE_BIT_SOL_HDR_INIT 13	49	#define XMSTATE_SOL_HDR_INIT 0x2000
50		50
51	#define ISCSI_PAD_LEN 4	51	#define ISCSI_PAD_LEN 4
52	#define ISCSI_SG_TABLESIZE SG_ALL	52	#define ISCSI_SG_TABLESIZE SG_ALL
@@ -122,7 +122,7 @@ struct iscsi_data_task {
122	struct iscsi_tcp_mgmt_task {	122	struct iscsi_tcp_mgmt_task {
123	struct iscsi_hdr hdr;	123	struct iscsi_hdr hdr;
124	char hdrext[sizeof(__u32)]; /* Header-Digest */	124	char hdrext[sizeof(__u32)]; /* Header-Digest */
125	unsigned long xmstate; /* mgmt xmit progress */	125	int xmstate; /* mgmt xmit progress */
126	struct iscsi_buf headbuf; /* header buffer */	126	struct iscsi_buf headbuf; /* header buffer */
127	struct iscsi_buf sendbuf; /* in progress buffer */	127	struct iscsi_buf sendbuf; /* in progress buffer */
128	int sent;	128	int sent;
@@ -150,7 +150,7 @@ struct iscsi_tcp_cmd_task {
150	int pad_count; /* padded bytes */	150	int pad_count; /* padded bytes */
151	struct iscsi_buf headbuf; /* header buf (xmit) */	151	struct iscsi_buf headbuf; /* header buf (xmit) */
152	struct iscsi_buf sendbuf; /* in progress buffer*/	152	struct iscsi_buf sendbuf; /* in progress buffer*/
153	unsigned long xmstate; /* xmit xtate machine */	153	int xmstate; /* xmit xtate machine */
154	int sent;	154	int sent;
155	struct scatterlist sg; / per-cmd SG list */	155	struct scatterlist sg; / per-cmd SG list */
156	struct scatterlist bad_sg; / assert statement */	156	struct scatterlist bad_sg; / assert statement */