diff options
author | Mike Christie <michaelc@cs.wisc.edu> | 2006-06-28 13:00:22 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-29 11:06:59 -0400 |
commit | 01cb225dad8da2e717356fab03240e2f4a8d01bf (patch) | |
tree | 8accf53a998b27b61362aec3fe61e7b72c69bbde /include/scsi/iscsi_if.h | |
parent | 332959cb521af6bb0281c7aae797f1f91dcb4c42 (diff) |
[SCSI] iscsi: add target discvery event to transport class
Patch from david.somayajulu@qlogic.com:
Add target discovery event. We may have a setup where the iscsi traffic
is on a different netowrk than the other network traffic. In this case
we will want to do discovery though the iscsi card. This patch adds
a event to the transport class that can be used by hw iscsi cards that
support this.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/scsi/iscsi_if.h')
-rw-r--r-- | include/scsi/iscsi_if.h | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h index 253797c60095..8813f0f4c624 100644 --- a/include/scsi/iscsi_if.h +++ b/include/scsi/iscsi_if.h | |||
@@ -47,12 +47,20 @@ enum iscsi_uevent_e { | |||
47 | ISCSI_UEVENT_TRANSPORT_EP_POLL = UEVENT_BASE + 13, | 47 | ISCSI_UEVENT_TRANSPORT_EP_POLL = UEVENT_BASE + 13, |
48 | ISCSI_UEVENT_TRANSPORT_EP_DISCONNECT = UEVENT_BASE + 14, | 48 | ISCSI_UEVENT_TRANSPORT_EP_DISCONNECT = UEVENT_BASE + 14, |
49 | 49 | ||
50 | ISCSI_UEVENT_TGT_DSCVR = UEVENT_BASE + 15, | ||
51 | |||
50 | /* up events */ | 52 | /* up events */ |
51 | ISCSI_KEVENT_RECV_PDU = KEVENT_BASE + 1, | 53 | ISCSI_KEVENT_RECV_PDU = KEVENT_BASE + 1, |
52 | ISCSI_KEVENT_CONN_ERROR = KEVENT_BASE + 2, | 54 | ISCSI_KEVENT_CONN_ERROR = KEVENT_BASE + 2, |
53 | ISCSI_KEVENT_IF_ERROR = KEVENT_BASE + 3, | 55 | ISCSI_KEVENT_IF_ERROR = KEVENT_BASE + 3, |
54 | }; | 56 | }; |
55 | 57 | ||
58 | enum iscsi_tgt_dscvr { | ||
59 | ISCSI_TGT_DSCVR_SEND_TARGETS = 1, | ||
60 | ISCSI_TGT_DSCVR_ISNS = 2, | ||
61 | ISCSI_TGT_DSCVR_SLP = 3, | ||
62 | }; | ||
63 | |||
56 | struct iscsi_uevent { | 64 | struct iscsi_uevent { |
57 | uint32_t type; /* k/u events type */ | 65 | uint32_t type; /* k/u events type */ |
58 | uint32_t iferror; /* carries interface or resource errors */ | 66 | uint32_t iferror; /* carries interface or resource errors */ |
@@ -116,6 +124,17 @@ struct iscsi_uevent { | |||
116 | struct msg_transport_disconnect { | 124 | struct msg_transport_disconnect { |
117 | uint64_t ep_handle; | 125 | uint64_t ep_handle; |
118 | } ep_disconnect; | 126 | } ep_disconnect; |
127 | struct msg_tgt_dscvr { | ||
128 | enum iscsi_tgt_dscvr type; | ||
129 | uint32_t host_no; | ||
130 | /* | ||
131 | * enable = 1 to establish a new connection | ||
132 | * with the server. enable = 0 to disconnect | ||
133 | * from the server. Used primarily to switch | ||
134 | * from one iSNS server to another. | ||
135 | */ | ||
136 | uint32_t enable; | ||
137 | } tgt_dscvr; | ||
119 | } u; | 138 | } u; |
120 | union { | 139 | union { |
121 | /* messages k -> u */ | 140 | /* messages k -> u */ |
@@ -141,6 +160,24 @@ struct iscsi_uevent { | |||
141 | struct msg_transport_connect_ret { | 160 | struct msg_transport_connect_ret { |
142 | uint64_t handle; | 161 | uint64_t handle; |
143 | } ep_connect_ret; | 162 | } ep_connect_ret; |
163 | struct msg_tgt_dscvr_ret { | ||
164 | /* | ||
165 | * session/connection pair used to reference | ||
166 | * the connection to server | ||
167 | */ | ||
168 | uint32_t sid; | ||
169 | uint32_t cid; | ||
170 | union { | ||
171 | struct isns { | ||
172 | /* port # for conn to iSNS server */ | ||
173 | uint16_t isns_port; | ||
174 | /* listening port to receive SCNs */ | ||
175 | uint16_t scn_port; | ||
176 | /* listening port to receive ESIs */ | ||
177 | uint16_t esi_port; | ||
178 | } isns_attrib; | ||
179 | } u; | ||
180 | } tgt_dscvr_ret; | ||
144 | } r; | 181 | } r; |
145 | } __attribute__ ((aligned (sizeof(uint64_t)))); | 182 | } __attribute__ ((aligned (sizeof(uint64_t)))); |
146 | 183 | ||