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

[Chris Leech]

commit 8ae36a9d67a993c191d3abcf61a63f01ded8be34
Author: mchristi <mchristi at redhat.com>
Date:   Mon Aug 15 05:03:15 2011 +0000

    Resolves: #715434 #696808

 ...ator-utils-uio-handle-different-iface_rec.patch |   43 +++++++++++++++++---
 1 files changed, 37 insertions(+), 6 deletions(-)
---
diff --git a/iscsi-initiator-utils-uio-handle-different-iface_rec.patch b/iscsi-initiator-utils-uio-handle-different-iface_rec.patch
index b1c8a70..1d37cc2 100644
--- a/iscsi-initiator-utils-uio-handle-different-iface_rec.patch
+++ b/iscsi-initiator-utils-uio-handle-different-iface_rec.patch
@@ -1,6 +1,6 @@
 diff -Naurp open-iscsi-2.0-872-rc4-bnx2i.base/iscsiuio/include/config.h open-iscsi-2.0-872-rc4-bnx2i.build2/iscsiuio/include/config.h
 --- open-iscsi-2.0-872-rc4-bnx2i.base/iscsiuio/include/config.h	2011-08-14 22:58:02.000000000 -0500
-+++ open-iscsi-2.0-872-rc4-bnx2i.build2/iscsiuio/include/config.h	2011-08-14 23:19:55.000000000 -0500
++++ open-iscsi-2.0-872-rc4-bnx2i.build2/iscsiuio/include/config.h	2011-08-15 00:05:23.000000000 -0500
 @@ -22,6 +22,7 @@
  
  #include <netdb.h>
@@ -9,13 +9,12 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i.base/iscsiuio/include/config.h open-isc
  
  /* ISIDs now have a typed naming authority in them.  We use an OUI */
  #define DRIVER_ISID_0  0x00
-@@ -31,18 +32,35 @@
+@@ -31,18 +32,33 @@
  /* max len of interface */
  #define ISCSI_MAX_IFACE_LEN	65
  
 -#if (ISCSID_VERSION == 872) /* 2.0-872 (RHEL 6.0) */
-+#if (ISCSID_VERSION == 872) /* 2.0-872 (RHEL 6.2) */
- 
+-
  #define ISCSI_HWADDRESS_BUF_SIZE 18
  #define ISCSI_TRANSPORT_NAME_MAXLEN 16
 +#define ISCSI_MAX_STR_LEN 80
@@ -46,15 +45,47 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i.base/iscsiuio/include/config.h open-isc
  	/*
  	 * TODO: we may have to make this bigger and interconnect
  	 * specific for infinniband 
-@@ -55,8 +73,6 @@ typedef struct iface_rec {
+@@ -55,40 +71,6 @@ typedef struct iface_rec {
  	 */
  	char			alias[TARGET_NAME_MAXLEN + 1];
  	char			iname[TARGET_NAME_MAXLEN + 1];
 -
 -	char			vlan[ISCSI_MAX_IFACE_LEN];
+-} iface_rec_t;
+-
+-#else /* 2.0-871 (RHEL 5.5)  */
+-/* number of possible connections per session */
+-#define ISCSI_CONN_MAX		1
+-
+-#define ISCSI_TRANSPORT_NAME_MAXLEN 16
+-
+-typedef struct iface_rec {
+-	struct list_head	list;
+-	/* iscsi iface record name */
+-	char			name[ISCSI_MAX_IFACE_LEN];
+-	/* network layer iface name (eth0) */
+-	char			netdev[IFNAMSIZ];
+-	char			ipaddress[NI_MAXHOST];
+-
+-	/*
+-	 * TODO: we may have to make this bigger and interconnect
+-	 * specific for infinniband 
+-	 */
+-	char			hwaddress[ISCSI_MAX_IFACE_LEN];
+-	char			transport_name[ISCSI_TRANSPORT_NAME_MAXLEN];
+-	/*
+-	 * This is only used for boot now, but the iser guys
+-	 * can use this for their virtualization idea.
+-	 */
+-	char			alias[TARGET_NAME_MAXLEN + 1];
+-	char			iname[TARGET_NAME_MAXLEN + 1];
+-
+-	char			vlan[ISCSI_MAX_IFACE_LEN];
  } iface_rec_t;
  
- #else /* 2.0-871 (RHEL 5.5)  */
+-#endif /* ISCSID_VERSION */
+-
+ #endif /* CONFIG_H */
 diff -Naurp open-iscsi-2.0-872-rc4-bnx2i.base/iscsiuio/include/iscsi_net_util.h open-iscsi-2.0-872-rc4-bnx2i.build2/iscsiuio/include/iscsi_net_util.h
 --- open-iscsi-2.0-872-rc4-bnx2i.base/iscsiuio/include/iscsi_net_util.h	1969-12-31 18:00:00.000000000 -0600
 +++ open-iscsi-2.0-872-rc4-bnx2i.build2/iscsiuio/include/iscsi_net_util.h	2011-08-14 23:20:09.000000000 -0500