Mike: big snx to session, cnx to conn renaming!

git-svn-id: svn://svn.berlios.de/open-iscsi@276 d7303112-9cec-0310-bdd2-e83a94d6c2b6

1 files changed, 29 insertions, 29 deletions

diff --git a/kernel/scsi_transport_iscsi.h b/kernel/scsi_transport_iscsi.h
index 4c506f8..cb95108 100644
--- a/kernel/scsi_transport_iscsi.h
+++ b/kernel/scsi_transport_iscsi.h
@@ -26,18 +26,18 @@
 /**
  * struct iscsi_transport - iSCSI Transport template
  *
- * @name:        transport name
- * @caps:        iSCSI Data-Path capabilities
- * @create_snx:  create new iSCSI session object
- * @destroy_snx: destroy existing iSCSI session object
- * @create_cnx:  create new iSCSI connection
- * @bind_cnx:    associate this connection with existing iSCSI session and
- *               specified transport descriptor
- * @destroy_cnx: destroy inactive iSCSI connection
- * @set_param:   set iSCSI Data-Path operational parameter
- * @start_cnx:   set connection to be operational
- * @stop_cnx:    suspend/recover/terminate connection
- * @send_pdu:    send iSCSI PDU, Login, Logout, NOP-Out, Reject, Text.
+ * @name:        	transport name
+ * @caps:        	iSCSI Data-Path capabilities
+ * @create_session:	create new iSCSI session object
+ * @destroy_session:	destroy existing iSCSI session object
+ * @create_conn:	create new iSCSI connection
+ * @bind_conn:		associate this connection with existing iSCSI session
+ * 			and specified transport descriptor
+ * @destroy_conn:	destroy inactive iSCSI connection
+ * @set_param:		set iSCSI Data-Path operational parameter
+ * @start_conn: 	set connection to be operational
+ * @stop_conn:		suspend/recover/terminate connection
+ * @send_pdu:		send iSCSI PDU, Login, Logout, NOP-Out, Reject, Text.
  *
  * Template API provided by iSCSI Transport
  */
@@ -48,24 +48,24 @@ struct iscsi_transport {
 	struct scsi_host_template *host_template;
 	int hostdata_size;
 	int max_lun;
-	unsigned int max_cnx;
+	unsigned int max_conn;
 	unsigned int max_cmd_len;
-	iscsi_snx_t (*create_session) (uint32_t initial_cmdsn,
-				       struct Scsi_Host *shost);
-	void (*destroy_session) (iscsi_snx_t snx);
-	iscsi_cnx_t (*create_cnx) (iscsi_snx_t snx, uint32_t cid);
-	int (*bind_cnx) (iscsi_snx_t snx, iscsi_cnx_t cnx,
-			uint32_t transport_fd, int is_leading);
-	int (*start_cnx) (iscsi_cnx_t cnx);
-	void (*stop_cnx) (iscsi_cnx_t cnx, int flag);
-	void (*destroy_cnx) (iscsi_cnx_t cnx);
-	int (*set_param) (iscsi_cnx_t cnx, enum iscsi_param param,
+	iscsi_sessionh_t (*create_session) (uint32_t initial_cmdsn,
+					    struct Scsi_Host *shost);
+	void (*destroy_session) (iscsi_sessionh_t session);
+	iscsi_connh_t (*create_conn) (iscsi_sessionh_t session, uint32_t cid);
+	int (*bind_conn) (iscsi_sessionh_t session, iscsi_connh_t conn,
+			  uint32_t transport_fd, int is_leading);
+	int (*start_conn) (iscsi_connh_t conn);
+	void (*stop_conn) (iscsi_connh_t conn, int flag);
+	void (*destroy_conn) (iscsi_connh_t conn);
+	int (*set_param) (iscsi_connh_t conn, enum iscsi_param param,
 			  uint32_t value);
-	int (*get_param) (iscsi_cnx_t cnx, enum iscsi_param param,
+	int (*get_param) (iscsi_connh_t conn, enum iscsi_param param,
 			  uint32_t *value);
-	int (*send_pdu) (iscsi_cnx_t cnx, struct iscsi_hdr *hdr,
+	int (*send_pdu) (iscsi_connh_t conn, struct iscsi_hdr *hdr,
 			 char *data, uint32_t data_size);
-	void (*get_stats) (iscsi_cnx_t cnx, struct iscsi_stats *stats);
+	void (*get_stats) (iscsi_connh_t conn, struct iscsi_stats *stats);
 	/*
 	 * transport class private data
 	 */
@@ -81,8 +81,8 @@ extern int iscsi_unregister_transport(struct iscsi_transport *tt);
 /*
  * control plane upcalls
  */
-extern void iscsi_cnx_error(iscsi_cnx_t cnx, enum iscsi_err error);
-extern int iscsi_recv_pdu(iscsi_cnx_t cnx, struct iscsi_hdr *hdr,
-				char *data, uint32_t data_size);
+extern void iscsi_conn_error(iscsi_connh_t conn, enum iscsi_err error);
+extern int iscsi_recv_pdu(iscsi_connh_t conn, struct iscsi_hdr *hdr,
+			  char *data, uint32_t data_size);
 
 #endif