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