diff options
Diffstat (limited to 'include/scsi')
-rw-r--r-- | include/scsi/iscsi_proto.h | 4 | ||||
-rw-r--r-- | include/scsi/libiscsi.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/scsi/iscsi_proto.h b/include/scsi/iscsi_proto.h index 318a909e7ae1..5ffec8ad6964 100644 --- a/include/scsi/iscsi_proto.h +++ b/include/scsi/iscsi_proto.h | |||
@@ -45,8 +45,8 @@ | |||
45 | /* initiator tags; opaque for target */ | 45 | /* initiator tags; opaque for target */ |
46 | typedef uint32_t __bitwise__ itt_t; | 46 | typedef uint32_t __bitwise__ itt_t; |
47 | /* below makes sense only for initiator that created this tag */ | 47 | /* below makes sense only for initiator that created this tag */ |
48 | #define build_itt(itt, id, age) ((__force itt_t)\ | 48 | #define build_itt(itt, age) ((__force itt_t)\ |
49 | ((itt) | ((id) << ISCSI_CID_SHIFT) | ((age) << ISCSI_AGE_SHIFT))) | 49 | ((itt) | ((age) << ISCSI_AGE_SHIFT))) |
50 | #define get_itt(itt) ((__force uint32_t)(itt_t)(itt) & ISCSI_ITT_MASK) | 50 | #define get_itt(itt) ((__force uint32_t)(itt_t)(itt) & ISCSI_ITT_MASK) |
51 | #define RESERVED_ITT ((__force itt_t)0xffffffff) | 51 | #define RESERVED_ITT ((__force itt_t)0xffffffff) |
52 | 52 | ||
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h index 5784e4ff8edc..7b90b63fb5c7 100644 --- a/include/scsi/libiscsi.h +++ b/include/scsi/libiscsi.h | |||
@@ -70,8 +70,6 @@ enum { | |||
70 | #define ISCSI_SUSPEND_BIT 1 | 70 | #define ISCSI_SUSPEND_BIT 1 |
71 | 71 | ||
72 | #define ISCSI_ITT_MASK (0xfff) | 72 | #define ISCSI_ITT_MASK (0xfff) |
73 | #define ISCSI_CID_SHIFT 12 | ||
74 | #define ISCSI_CID_MASK (0xffff << ISCSI_CID_SHIFT) | ||
75 | #define ISCSI_AGE_SHIFT 28 | 73 | #define ISCSI_AGE_SHIFT 28 |
76 | #define ISCSI_AGE_MASK (0xf << ISCSI_AGE_SHIFT) | 74 | #define ISCSI_AGE_MASK (0xf << ISCSI_AGE_SHIFT) |
77 | 75 | ||