Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > d18fa7374095732a0ead4cb4065710a5 > files > 11

iscsi-initiator-utils-6.2.0.871-0.12.el5_4.1.src.rpm

Only in open-iscsi-2.0-871-test4.bnx2i.work/: fix-iscsid-conn-context-segfault.patch
diff -aurp open-iscsi-2.0-871-test4.bnx2i/usr/initiator.c open-iscsi-2.0-871-test4.bnx2i.work/usr/initiator.c
--- open-iscsi-2.0-871-test4.bnx2i/usr/initiator.c	2009-07-09 11:25:19.000000000 -0500
+++ open-iscsi-2.0-871-test4.bnx2i.work/usr/initiator.c	2009-07-09 11:24:56.000000000 -0500
@@ -45,6 +45,7 @@
 #include "iscsi_sysfs.h"
 #include "iscsi_settings.h"
 #include "iface.h"
+#include "host.h"
 #include "sysdeps.h"
 
 #define ISCSI_CONN_ERR_REOPEN_DELAY	3
@@ -2089,9 +2090,18 @@ static int iface_set_param(struct iscsi_
 	session->conn[0].bind_ep = 1;
 	session->hostno = hostno;
 
-	if(t->template->set_net_config) {
-		rc = t->template->set_net_config(t, iface, session);
-		return rc;
+	if (t->template->set_net_config) {
+		struct host_info hinfo;
+
+		/* uip needs the netdev name */
+		if (!strlen(iface->netdev)) {
+			memset(&hinfo, 0, sizeof(hinfo));
+			hinfo.host_no = hostno;
+			iscsi_sysfs_get_hostinfo_by_host_no(&hinfo);
+			strcpy(iface->netdev, hinfo.iface.netdev);
+		}
+
+		return t->template->set_net_config(t, iface, session);
 	}
 
 	rc = __iscsi_host_set_param(t, session->hostno,