]>
Commit | Line | Data |
---|---|---|
092b90ae SS |
1 | From aa58a042ec20575143c1a5c813c9552a286aeb0e Mon Sep 17 00:00:00 2001 |
2 | From: Chris Leech <cleech@redhat.com> | |
3 | Date: Mon, 19 Nov 2012 17:09:24 -0800 | |
4 | Subject: remove the offload boot supported ifdef | |
5 | ||
6 | --- | |
7 | usr/iface.c | 7 +------ | |
8 | 1 file changed, 1 insertion(+), 6 deletions(-) | |
9 | ||
10 | diff --git a/usr/iface.c b/usr/iface.c | |
11 | index c86892e..f5441c0 100644 | |
12 | --- a/usr/iface.c | |
13 | +++ b/usr/iface.c | |
14 | @@ -895,6 +895,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface, | |
15 | { | |
16 | struct iscsi_transport *t = NULL; | |
17 | uint32_t hostno; | |
18 | + int rc; | |
19 | ||
20 | if (strlen(context->initiatorname)) | |
21 | strlcpy(iface->iname, context->initiatorname, | |
22 | @@ -907,10 +908,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface, | |
23 | return 0; | |
24 | } | |
25 | } else if (strlen(context->iface)) { | |
26 | -/* this ifdef is only temp until distros and firmwares are updated */ | |
27 | -#ifdef OFFLOAD_BOOT_SUPPORTED | |
28 | char transport_name[ISCSI_TRANSPORT_NAME_MAXLEN]; | |
29 | - int rc; | |
30 | ||
31 | memset(transport_name, 0, ISCSI_TRANSPORT_NAME_MAXLEN); | |
32 | /* make sure offload driver is loaded */ | |
33 | @@ -936,9 +934,6 @@ int iface_setup_from_boot_context(struct iface_rec *iface, | |
34 | } | |
35 | ||
36 | strlcpy(iface->netdev, context->iface, sizeof(iface->netdev)); | |
37 | -#else | |
38 | - return 0; | |
39 | -#endif | |
40 | } else | |
41 | return 0; | |
42 | ||
43 | -- | |
44 | 1.7.11.7 | |
45 |