From 6997f36c44cd7046d1be1248fd864d9a068faff5 Mon Sep 17 00:00:00 2001
From: Nilesh Javali <njavali@marvell.com>
Date: Tue, 25 Jun 2019 01:05:01 -0400
Subject: [PATCH 1/1] iscsiuio: allow processing of iscsid requests in DHCP
 failure condition

In the event of DHCP failure, killing of enable_nic_thread did not
process any iscsid requests leading to error,
iscsistart: Could not broadcast to uIP after 5 tries
and login failure to next active path.
Do not kill enable_nic_thread and allow further processing of iscsid
requests and performing login to next active path.

Signed-off-by: Nilesh Javali <njavali@marvell.com>
---
 iscsiuio/src/unix/nic.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/iscsiuio/src/unix/nic.c b/iscsiuio/src/unix/nic.c
index bd415c2..f449935 100644
--- a/iscsiuio/src/unix/nic.c
+++ b/iscsiuio/src/unix/nic.c
@@ -1318,21 +1318,6 @@ static int do_acquisition(nic_t *nic, nic_interface_t *nic_iface,
 			/* For DHCPv4 failure, the ustack must be cleaned so
 			   it can re-acquire on the next iscsid request */
 			uip_reset(&nic_iface->ustack);
-
-			/*  Signal that the device enable is
-			    done */
-			pthread_cond_broadcast(&nic->enable_done_cond);
-			pthread_mutex_unlock(&nic->nic_mutex);
-
-			if (nic->enable_thread == INVALID_THREAD)
-				goto dhcp_err;
-
-			rc = pthread_cancel(nic->enable_thread);
-			if (rc != 0)
-				LOG_ERR(PFX "%s: Couldn't cancel "
-					"enable nic thread", nic->log_name);
-dhcp_err:
-			pthread_mutex_lock(&nic->nic_mutex);
 			goto error;
 		}
 
-- 
2.21.0