Resolves: #696808
This commit is contained in:
parent
3406ff5fba
commit
3ddf135842
@ -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
|
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/iscsi_net_util.c 2011-01-31 19:24:50.000000000 -0600
|
--- 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.work/usr/iscsi_net_util.c 2011-01-31 19:26:28.000000000 -0600
|
+++ 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 {
|
@@ -39,12 +39,10 @@ struct iscsi_net_driver {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
Summary: iSCSI daemon and utility programs
|
Summary: iSCSI daemon and utility programs
|
||||||
Name: iscsi-initiator-utils
|
Name: iscsi-initiator-utils
|
||||||
Version: 6.2.0.872
|
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
|
Source0: http://people.redhat.com/mchristi/iscsi/rhel6.0/source/open-iscsi-2.0-872-rc4-bnx2i.tar.gz
|
||||||
Source1: iscsid.init
|
Source1: iscsid.init
|
||||||
Source2: iscsidevs.init
|
Source2: iscsidevs.init
|
||||||
@ -206,6 +206,9 @@ fi
|
|||||||
%{_includedir}/libiscsi.h
|
%{_includedir}/libiscsi.h
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 8 2011 Mike Christie <mcrhsit@redhat.com> 6.2.0.872.26
|
||||||
|
- Fix offload removal patch
|
||||||
|
|
||||||
* Thu Sep 1 2011 Mike Christie <mcrhsit@redhat.com> 6.2.0.872.25
|
* Thu Sep 1 2011 Mike Christie <mcrhsit@redhat.com> 6.2.0.872.25
|
||||||
- 732912 Fix return value/msg when iscsiadm fails to log into target
|
- 732912 Fix return value/msg when iscsiadm fails to log into target
|
||||||
- 696808 Update iscsiuio to v0.7.0.14.
|
- 696808 Update iscsiuio to v0.7.0.14.
|
||||||
|
Loading…
Reference in New Issue
Block a user