[iscsi-initiator-utils: 74/109] Resolves: #696808

[Chris Leech]

commit 3ddf1358429e94df3ead94121b66e1d3426f537f
Author: mchristi <mchristi at redhat.com>
Date:   Thu Sep 8 20:48:05 2011 +0000

    Resolves: #696808

 ...s-remove-the-offload-boot-supported-ifdef.patch |   36 ++++++++++++++++++--
 iscsi-initiator-utils.spec                         |    5 ++-
 2 files changed, 37 insertions(+), 4 deletions(-)
---
diff --git a/iscsi-initiator-utils-remove-the-offload-boot-supported-ifdef.patch b/iscsi-initiator-utils-remove-the-offload-boot-supported-ifdef.patch
index df63bf4..78f96da 100644
--- a/iscsi-initiator-utils-remove-the-offload-boot-supported-ifdef.patch
+++ b/iscsi-initiator-utils-remove-the-offload-boot-supported-ifdef.patch
@@ -1,6 +1,36 @@
-diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c
---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c	2011-01-31 19:24:50.000000000 -0600
-+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c	2011-01-31 19:26:28.000000000 -0600
+diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c open-iscsi-2.0-872-rc4-bnx2i.test/usr/iface.c
+--- open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c	2011-09-08 15:26:45.000000000 -0500
++++ open-iscsi-2.0-872-rc4-bnx2i.test/usr/iface.c	2011-09-08 15:31:32.000000000 -0500
+@@ -829,6 +829,7 @@ int iface_setup_from_boot_context(struct
+ {
+ 	struct iscsi_transport *t;
+ 	uint32_t hostno;
++	int rc;
+ 
+ 	if (strlen(context->initiatorname))
+ 		strlcpy(iface->iname, context->initiatorname,
+@@ -841,8 +842,6 @@ int iface_setup_from_boot_context(struct
+ 			return 0;
+ 		}
+ 	} else if (strlen(context->iface)) {
+-/* this ifdef is only temp until distros and firmwares are updated */
+-#ifdef OFFLOAD_BOOT_SUPPORTED
+ 		hostno = iscsi_sysfs_get_host_no_from_hwaddress(context->mac,
+ 								&rc);
+ 		if (rc) {
+@@ -857,9 +856,6 @@ int iface_setup_from_boot_context(struct
+ 		}
+ 
+ 		strlcpy(iface->netdev, context->iface, sizeof(iface->netdev));
+-#else
+-		return 0;
+-#endif
+ 	} else
+ 		return 0;
+ 
+diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872-rc4-bnx2i.test/usr/iscsi_net_util.c
+--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c	2011-09-08 15:27:24.000000000 -0500
++++ open-iscsi-2.0-872-rc4-bnx2i.test/usr/iscsi_net_util.c	2011-09-08 15:26:50.000000000 -0500
 @@ -39,12 +39,10 @@ struct iscsi_net_driver {
  };
  
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index b0162bd..cea5cd5 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -3,7 +3,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.872
-Release: 25%{?dist}
+Release: 26%{?dist}
 Source0: http://people.redhat.com/mchristi/iscsi/rhel6.0/source/open-iscsi-2.0-872-rc4-bnx2i.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -206,6 +206,9 @@ fi
 %{_includedir}/libiscsi.h
 
 %changelog
+* Thu Sep 8 2011 Mike Christie <mcrhsit at redhat.com> 6.2.0.872.26
+- Fix offload removal patch
+
 * Thu Sep 1 2011 Mike Christie <mcrhsit at redhat.com> 6.2.0.872.25
 - 732912 Fix return value/msg when iscsiadm fails to log into target
 - 696808 Update iscsiuio to v0.7.0.14.