From df98e29b806fb4c99e6ba85d6b2ae468c3ade3c6 Mon Sep 17 00:00:00 2001 From: akozumpl Date: Tue, 30 Nov 2010 08:33:58 +0000 Subject: [PATCH] Related: rhbz#442980 --- ...ove-the-offload-boot-supported-ifdef.patch | 29 +++++++++++++++++++ iscsi-initiator-utils.spec | 10 +++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 iscsi-initiator-utils-remove-the-offload-boot-supported-ifdef.patch diff --git a/iscsi-initiator-utils-remove-the-offload-boot-supported-ifdef.patch b/iscsi-initiator-utils-remove-the-offload-boot-supported-ifdef.patch new file mode 100644 index 0000000..5782f20 --- /dev/null +++ b/iscsi-initiator-utils-remove-the-offload-boot-supported-ifdef.patch @@ -0,0 +1,29 @@ +From cac36706909b91ba3254cd8083291bf6746e831b Mon Sep 17 00:00:00 2001 +From: Ales Kozumplik +Date: Fri, 26 Nov 2010 17:27:42 +0100 +Subject: [PATCH] Remove the OFFLOAD_BOOT_SUPPORTED #ifdef. + +This effectively makes OFFLOAD_BOOT_SUPPORTED always enabled. +--- + usr/iscsi_net_util.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/usr/iscsi_net_util.c b/usr/iscsi_net_util.c +index cbe6f56..992d930 100644 +--- a/usr/iscsi_net_util.c ++++ b/usr/iscsi_net_util.c +@@ -39,11 +39,9 @@ struct iscsi_net_driver { + }; + + static struct iscsi_net_driver net_drivers[] = { +-#ifdef OFFLOAD_BOOT_SUPPORTED + {"cxgb3", "cxgb3i" }, + {"bnx2", "bnx2i" }, + {"bnx2x", "bnx2i"}, +-#endif + {NULL, NULL} + }; + +-- +1.7.3.2 + diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index 3e58de2..9c8ed8e 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: 11%{?dist} +Release: 12%{?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 @@ -40,7 +40,8 @@ Patch13: iscsi-initiator-utils-fix-uip-rhel-version-bump.patch Patch14: iscsi-initiator-utils-log-login-failed.patch # brcm uio: handle the different iface_rec structures in iscsid and brcm. Patch15: iscsi-initiator-utils-uio-handle-different-iface_rec.patch - +# Remove the OFFLOAD_BOOT_SUPPORTED #ifdef. +Patch16: iscsi-initiator-utils-remove-the-offload-boot-supported-ifdef.patch Group: System Environment/Daemons License: GPLv2+ @@ -84,6 +85,7 @@ developing applications that use %{name}. %patch13 -p1 -b .fix-brcm-version-bump %patch14 -p1 -b .log-login-failed %patch15 -p1 -b .uio-different-iface +%patch16 -p1 -b .offload-boot-supported %build cd utils/open-isns @@ -202,6 +204,10 @@ fi %{_includedir}/libiscsi.h %changelog +* Tue Nov 30 2010 Ales Kozumplik 6.2.0.872.12 +- 442980 partial offload boot: Remove the OFFLOAD_BOOT_SUPPORTED ifdef. This + effectively makes OFFLOAD_BOOT_SUPPORTED always enabled. + * Mon Nov 29 2010 Ales Kozumplik 6.2.0.872.11 - 442980 brcm uio: handle the different iface_rec structures in iscsid and brcm.