diff options
Diffstat (limited to 'drivers/infiniband/ulp/iser/iscsi_iser.h')
-rw-r--r-- | drivers/infiniband/ulp/iser/iscsi_iser.h | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h index 5babdb35bda7..06f578cde75b 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.h +++ b/drivers/infiniband/ulp/iser/iscsi_iser.h | |||
@@ -42,6 +42,7 @@ | |||
42 | 42 | ||
43 | #include <linux/types.h> | 43 | #include <linux/types.h> |
44 | #include <linux/net.h> | 44 | #include <linux/net.h> |
45 | #include <linux/printk.h> | ||
45 | #include <scsi/libiscsi.h> | 46 | #include <scsi/libiscsi.h> |
46 | #include <scsi/scsi_transport_iscsi.h> | 47 | #include <scsi/scsi_transport_iscsi.h> |
47 | 48 | ||
@@ -65,20 +66,26 @@ | |||
65 | 66 | ||
66 | #define DRV_NAME "iser" | 67 | #define DRV_NAME "iser" |
67 | #define PFX DRV_NAME ": " | 68 | #define PFX DRV_NAME ": " |
68 | #define DRV_VER "0.1" | 69 | #define DRV_VER "1.1" |
69 | #define DRV_DATE "May 7th, 2006" | ||
70 | 70 | ||
71 | #define iser_dbg(fmt, arg...) \ | 71 | #define iser_dbg(fmt, arg...) \ |
72 | do { \ | 72 | do { \ |
73 | if (iser_debug_level > 1) \ | 73 | if (iser_debug_level > 2) \ |
74 | printk(KERN_DEBUG PFX "%s:" fmt,\ | 74 | printk(KERN_DEBUG PFX "%s:" fmt,\ |
75 | __func__ , ## arg); \ | 75 | __func__ , ## arg); \ |
76 | } while (0) | 76 | } while (0) |
77 | 77 | ||
78 | #define iser_warn(fmt, arg...) \ | 78 | #define iser_warn(fmt, arg...) \ |
79 | do { \ | 79 | do { \ |
80 | if (iser_debug_level > 1) \ | ||
81 | pr_warn(PFX "%s:" fmt, \ | ||
82 | __func__ , ## arg); \ | ||
83 | } while (0) | ||
84 | |||
85 | #define iser_info(fmt, arg...) \ | ||
86 | do { \ | ||
80 | if (iser_debug_level > 0) \ | 87 | if (iser_debug_level > 0) \ |
81 | printk(KERN_DEBUG PFX "%s:" fmt,\ | 88 | pr_info(PFX "%s:" fmt, \ |
82 | __func__ , ## arg); \ | 89 | __func__ , ## arg); \ |
83 | } while (0) | 90 | } while (0) |
84 | 91 | ||
@@ -133,6 +140,15 @@ struct iser_hdr { | |||
133 | __be64 read_va; | 140 | __be64 read_va; |
134 | } __attribute__((packed)); | 141 | } __attribute__((packed)); |
135 | 142 | ||
143 | |||
144 | #define ISER_ZBVA_NOT_SUPPORTED 0x80 | ||
145 | #define ISER_SEND_W_INV_NOT_SUPPORTED 0x40 | ||
146 | |||
147 | struct iser_cm_hdr { | ||
148 | u8 flags; | ||
149 | u8 rsvd[3]; | ||
150 | } __packed; | ||
151 | |||
136 | /* Constant PDU lengths calculations */ | 152 | /* Constant PDU lengths calculations */ |
137 | #define ISER_HEADERS_LEN (sizeof(struct iser_hdr) + sizeof(struct iscsi_hdr)) | 153 | #define ISER_HEADERS_LEN (sizeof(struct iser_hdr) + sizeof(struct iscsi_hdr)) |
138 | 154 | ||