[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, upstream-mnc, updated. 2.0-872-193-gde2c0e7

[Mike Christie]

The following commit has been merged in the upstream-mnc branch:
commit 67e05760843bb8614f31eb8fb74390e1d629f977
Author: Mike Christie <michaelc at cs.wisc.edu>
Date:   Mon Mar 5 15:28:46 2012 -0600

    iscsi tools: never use hdr digest with iser
    
    iSER does not support header digests, so always turn
    them off when iSER is used.

diff --git a/usr/Makefile b/usr/Makefile
index bc7af2c..d94ed86 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -41,7 +41,7 @@ SYSDEPS_SRCS = $(wildcard ../utils/sysdeps/*.o)
 # sources shared between iscsid, iscsiadm and iscsistart
 ISCSI_LIB_SRCS = iscsi_util.o io.o auth.o iscsi_timer.o login.o log.o md5.o \
 	sha1.o iface.o idbm.o sysfs.o host.o session_info.o iscsi_sysfs.o \
-	iscsi_net_util.o iscsid_req.o transport.o cxgbi.o be2iscsi.o \
+	iscsi_net_util.o iscsid_req.o transport.o iser.o cxgbi.o be2iscsi.o \
 	initiator_common.o iscsi_err.o $(IPC_OBJ)  $(SYSDEPS_SRCS) $(DCB_OBJ)
 # core initiator files
 INITIATOR_SRCS = initiator.o scsi.o actor.o event_poll.o mgmt_ipc.o kern_err_table.o
diff --git a/usr/cxgbi.c b/usr/iser.c
similarity index 66%
copy from usr/cxgbi.c
copy to usr/iser.c
index 4f3d1db..30459bb 100644
--- a/usr/cxgbi.c
+++ b/usr/iser.c
@@ -1,8 +1,7 @@
 /*
- * cxgb3i/cxgb4i helpers
+ * iser helpers
  *
- * Copyright (C) 2006 Mike Christie
- * Copyright (C) 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2012 Red Hat, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published
@@ -16,9 +15,8 @@
  */
 #include "initiator.h"
 
-void cxgbi_create_conn(struct iscsi_conn *conn)
+void iser_create_conn(struct iscsi_conn *conn)
 {
-	/* card can handle up to 15360 bytes */
-	if (conn->max_recv_dlength > 8192)
-		conn->max_recv_dlength = 8192;
+	/* header digests not supported in iser */
+	conn->hdrdgst_en = ISCSI_DIGEST_NONE;
 }
diff --git a/usr/iser.h b/usr/iser.h
new file mode 100644
index 0000000..e805cae
--- /dev/null
+++ b/usr/iser.h
@@ -0,0 +1,8 @@
+#ifndef ISER_TRANSPORT
+#define ISER_TRANSPORT
+
+struct iscsi_conn;
+
+extern void iser_create_conn(struct iscsi_conn *conn);
+
+#endif
diff --git a/usr/transport.c b/usr/transport.c
index 5d6bea4..e04157e 100644
--- a/usr/transport.c
+++ b/usr/transport.c
@@ -27,6 +27,7 @@
 #include "iscsi_sysfs.h"
 #include "cxgbi.h"
 #include "be2iscsi.h"
+#include "iser.h"
 
 struct iscsi_transport_template iscsi_tcp = {
 	.name		= "tcp",
@@ -41,6 +42,7 @@ struct iscsi_transport_template iscsi_iser = {
 	.ep_connect	= ktransport_ep_connect,
 	.ep_poll	= ktransport_ep_poll,
 	.ep_disconnect	= ktransport_ep_disconnect,
+	.create_conn	= iser_create_conn,
 };
 
 struct iscsi_transport_template cxgb3i = {

-- 
Debian Open-iSCSI Packaging