diff options
Diffstat (limited to 'include/scsi')
-rw-r--r-- | include/scsi/iscsi_if.h | 8 | ||||
-rw-r--r-- | include/scsi/scsi_transport_iscsi.h | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h index 55ebf035e620..fba211743729 100644 --- a/include/scsi/iscsi_if.h +++ b/include/scsi/iscsi_if.h | |||
@@ -250,6 +250,14 @@ enum iscsi_param { | |||
250 | #define ISCSI_CONN_PORT (1 << ISCSI_PARAM_CONN_PORT) | 250 | #define ISCSI_CONN_PORT (1 << ISCSI_PARAM_CONN_PORT) |
251 | #define ISCSI_CONN_ADDRESS (1 << ISCSI_PARAM_CONN_ADDRESS) | 251 | #define ISCSI_CONN_ADDRESS (1 << ISCSI_PARAM_CONN_ADDRESS) |
252 | 252 | ||
253 | /* iSCSI HBA params */ | ||
254 | enum iscsi_host_param { | ||
255 | ISCSI_HOST_PARAM_HWADDRESS, | ||
256 | ISCSI_HOST_PARAM_MAX, | ||
257 | }; | ||
258 | |||
259 | #define ISCSI_HOST_HWADDRESS (1 << ISCSI_HOST_PARAM_HWADDRESS) | ||
260 | |||
253 | #define iscsi_ptr(_handle) ((void*)(unsigned long)_handle) | 261 | #define iscsi_ptr(_handle) ((void*)(unsigned long)_handle) |
254 | #define iscsi_handle(_ptr) ((uint64_t)(unsigned long)_ptr) | 262 | #define iscsi_handle(_ptr) ((uint64_t)(unsigned long)_ptr) |
255 | #define hostdata_session(_hostdata) (iscsi_ptr(*(unsigned long *)_hostdata)) | 263 | #define hostdata_session(_hostdata) (iscsi_ptr(*(unsigned long *)_hostdata)) |
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h index d5c218ddc527..e962c5357eef 100644 --- a/include/scsi/scsi_transport_iscsi.h +++ b/include/scsi/scsi_transport_iscsi.h | |||
@@ -79,7 +79,8 @@ struct iscsi_transport { | |||
79 | char *name; | 79 | char *name; |
80 | unsigned int caps; | 80 | unsigned int caps; |
81 | /* LLD sets this to indicate what values it can export to sysfs */ | 81 | /* LLD sets this to indicate what values it can export to sysfs */ |
82 | unsigned int param_mask; | 82 | uint64_t param_mask; |
83 | uint64_t host_param_mask; | ||
83 | struct scsi_host_template *host_template; | 84 | struct scsi_host_template *host_template; |
84 | /* LLD connection data size */ | 85 | /* LLD connection data size */ |
85 | int conndata_size; | 86 | int conndata_size; |
@@ -105,6 +106,8 @@ struct iscsi_transport { | |||
105 | enum iscsi_param param, char *buf); | 106 | enum iscsi_param param, char *buf); |
106 | int (*get_session_param) (struct iscsi_cls_session *session, | 107 | int (*get_session_param) (struct iscsi_cls_session *session, |
107 | enum iscsi_param param, char *buf); | 108 | enum iscsi_param param, char *buf); |
109 | int (*get_host_param) (struct Scsi_Host *shost, | ||
110 | enum iscsi_host_param param, char *buf); | ||
108 | int (*send_pdu) (struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr, | 111 | int (*send_pdu) (struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr, |
109 | char *data, uint32_t data_size); | 112 | char *data, uint32_t data_size); |
110 | void (*get_stats) (struct iscsi_cls_conn *conn, | 113 | void (*get_stats) (struct iscsi_cls_conn *conn, |