[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, upstream-mnc, updated. 2.0.871.3-1-84-g59f5d1e

[Mike Christie]

The following commit has been merged in the upstream-mnc branch:
commit f11b391bded377708c8e2c5c52ed626d3f2a1fa9
Author: Karen Xie <kxie at chelsio.com>
Date:   Fri Aug 13 14:06:45 2010 -0700

    open-iscsi: add transport cxgb4i
    
    This patch added the new transport cxgb4i.
    
    Signed-off-by: Karen Xie <kxie at chelsio.com>

diff --git a/usr/Makefile b/usr/Makefile
index e9d6bd1..b02a706 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -42,7 +42,7 @@ ISCSI_LIB_SRCS = iscsi_util.o io.o auth.o login.o log.o md5.o sha1.o iface.o \
 	iscsid_req.o $(SYSDEPS_SRCS)
 # core initiator files
 INITIATOR_SRCS = initiator.o scsi.o actor.o event_poll.o mgmt_ipc.o \
-		transport.o cxgb3i.o be2iscsi.o
+		transport.o cxgbi.o be2iscsi.o
 # fw boot files
 FW_BOOT_SRCS = $(wildcard ../utils/fwparam_ibft/*.o)
 
diff --git a/usr/cxgb3i.h b/usr/cxgb3i.h
deleted file mode 100644
index bff4aae..0000000
--- a/usr/cxgb3i.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CXGB3I_TRANSPORT
-#define CXGB3I_TRANSPORT
-
-struct iscsi_conn;
-
-extern void cxgb3i_create_conn(struct iscsi_conn *conn);
-
-#endif
diff --git a/usr/cxgb3i.c b/usr/cxgbi.c
similarity index 91%
rename from usr/cxgb3i.c
rename to usr/cxgbi.c
index 39776a3..4f3d1db 100644
--- a/usr/cxgb3i.c
+++ b/usr/cxgbi.c
@@ -1,5 +1,5 @@
 /*
- * cxgb3i helpers
+ * cxgb3i/cxgb4i helpers
  *
  * Copyright (C) 2006 Mike Christie
  * Copyright (C) 2006 Red Hat, Inc. All rights reserved.
@@ -16,7 +16,7 @@
  */
 #include "initiator.h"
 
-void cxgb3i_create_conn(struct iscsi_conn *conn)
+void cxgbi_create_conn(struct iscsi_conn *conn)
 {
 	/* card can handle up to 15360 bytes */
 	if (conn->max_recv_dlength > 8192)
diff --git a/usr/cxgbi.h b/usr/cxgbi.h
new file mode 100644
index 0000000..bd46603
--- /dev/null
+++ b/usr/cxgbi.h
@@ -0,0 +1,8 @@
+#ifndef CXGBI_TRANSPORT
+#define CXGBI_TRANSPORT
+
+struct iscsi_conn;
+
+extern void cxgbi_create_conn(struct iscsi_conn *conn);
+
+#endif
diff --git a/usr/iscsi_net_util.c b/usr/iscsi_net_util.c
index cbe6f56..e801b48 100644
--- a/usr/iscsi_net_util.c
+++ b/usr/iscsi_net_util.c
@@ -41,6 +41,7 @@ struct iscsi_net_driver {
 static struct iscsi_net_driver net_drivers[] = {
 #ifdef OFFLOAD_BOOT_SUPPORTED
 	{"cxgb3", "cxgb3i" },
+	{"cxgb4", "cxgb4i" },
 	{"bnx2", "bnx2i" },
 	{"bnx2x", "bnx2i"},
 #endif
diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c
index 31a8c88..6eca3c8 100644
--- a/usr/iscsi_sysfs.c
+++ b/usr/iscsi_sysfs.c
@@ -459,7 +459,7 @@ static int iscsi_sysfs_read_iface(struct iface_rec *iface, int host_no,
 	 * host level because we cannot create different initiator ports
 	 * (cannot set isid either). The LLD also exports the iname at the
 	 * hba level so apps can see it, but we no longer set the iname for
-	 * each iscsid controlled host since bnx2i cxgb3i can support multiple
+	 * each iscsid controlled host since bnx2i cxgbi can support multiple
 	 * initiator names and of course software iscsi can support anything.
 	 */
 	ret = 1;
diff --git a/usr/iscsid.c b/usr/iscsid.c
index 402e4f3..a659176 100644
--- a/usr/iscsid.c
+++ b/usr/iscsid.c
@@ -318,7 +318,7 @@ static void missing_iname_warn(char *initiatorname_file)
 	log_error("Warning: InitiatorName file %s does not exist or does not "
 		  "contain a properly formated InitiatorName. If using "
 		  "software iscsi (iscsi_tcp or ib_iser) or partial offload "
-		  "(bnx2i or cxgb3i iscsi), you may not be able to log "
+		  "(bnx2i or cxgbi iscsi), you may not be able to log "
 		  "into or discover targets. Please create a file %s that "
 		  "contains a sting with the format: InitiatorName="
 		  "iqn.yyyy-mm.<reversed domain name>[:identifier].\n\n"
diff --git a/usr/transport.c b/usr/transport.c
index c0789bb..2c5224f 100644
--- a/usr/transport.c
+++ b/usr/transport.c
@@ -25,7 +25,7 @@
 #include "log.h"
 #include "iscsi_util.h"
 #include "iscsi_sysfs.h"
-#include "cxgb3i.h"
+#include "cxgbi.h"
 #include "be2iscsi.h"
 
 struct iscsi_transport_template iscsi_tcp = {
@@ -49,7 +49,16 @@ struct iscsi_transport_template cxgb3i = {
 	.ep_connect	= ktransport_ep_connect,
 	.ep_poll	= ktransport_ep_poll,
 	.ep_disconnect	= ktransport_ep_disconnect,
-	.create_conn	= cxgb3i_create_conn,
+	.create_conn	= cxgbi_create_conn,
+};
+
+struct iscsi_transport_template cxgb4i = {
+	.name		= "cxgb4i",
+	.set_host_ip	= 1,
+	.ep_connect	= ktransport_ep_connect,
+	.ep_poll	= ktransport_ep_poll,
+	.ep_disconnect	= ktransport_ep_disconnect,
+	.create_conn	= cxgbi_create_conn,
 };
 
 struct iscsi_transport_template bnx2i = {
@@ -76,6 +85,7 @@ static struct iscsi_transport_template *iscsi_transport_templates[] = {
 	&iscsi_tcp,
 	&iscsi_iser,
 	&cxgb3i,
+	&cxgb4i,
 	&bnx2i,
 	&qla4xxx,
 	&be2iscsi,

-- 
Debian Open-iSCSI Packaging