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