|
 |
6c64be |
From aa58a042ec20575143c1a5c813c9552a286aeb0e Mon Sep 17 00:00:00 2001
|
|
|
6c64be |
From: Chris Leech <cleech@redhat.com>
|
|
|
6c64be |
Date: Mon, 19 Nov 2012 17:09:24 -0800
|
|
|
6c64be |
Subject: remove the offload boot supported ifdef
|
|
|
6c64be |
|
|
|
6c64be |
---
|
|
|
6c64be |
usr/iface.c | 7 +------
|
|
|
6c64be |
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
6c64be |
|
|
|
6c64be |
diff --git a/usr/iface.c b/usr/iface.c
|
|
|
6c64be |
index c86892e..f5441c0 100644
|
|
|
6c64be |
--- a/usr/iface.c
|
|
|
6c64be |
+++ b/usr/iface.c
|
|
|
6c64be |
@@ -895,6 +895,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
|
|
|
6c64be |
{
|
|
|
6c64be |
struct iscsi_transport *t = NULL;
|
|
|
6c64be |
uint32_t hostno;
|
|
|
6c64be |
+ int rc;
|
|
|
6c64be |
|
|
|
6c64be |
if (strlen(context->initiatorname))
|
|
|
6c64be |
strlcpy(iface->iname, context->initiatorname,
|
|
|
6c64be |
@@ -907,10 +908,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
|
|
|
6c64be |
return 0;
|
|
|
6c64be |
}
|
|
|
6c64be |
} else if (strlen(context->iface)) {
|
|
|
6c64be |
-/* this ifdef is only temp until distros and firmwares are updated */
|
|
|
6c64be |
-#ifdef OFFLOAD_BOOT_SUPPORTED
|
|
|
6c64be |
char transport_name[ISCSI_TRANSPORT_NAME_MAXLEN];
|
|
|
6c64be |
- int rc;
|
|
|
6c64be |
|
|
|
6c64be |
memset(transport_name, 0, ISCSI_TRANSPORT_NAME_MAXLEN);
|
|
|
6c64be |
/* make sure offload driver is loaded */
|
|
|
6c64be |
@@ -936,9 +934,6 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
|
|
|
6c64be |
}
|
|
|
6c64be |
|
|
|
6c64be |
strlcpy(iface->netdev, context->iface, sizeof(iface->netdev));
|
|
|
6c64be |
-#else
|
|
|
6c64be |
- return 0;
|
|
|
6c64be |
-#endif
|
|
|
6c64be |
} else
|
|
|
6c64be |
return 0;
|
|
|
6c64be |
|
|
|
6c64be |
--
|
|
|
6c64be |
1.7.11.7
|
|
|
6c64be |
|