|
 |
e88930 |
From 6997f36c44cd7046d1be1248fd864d9a068faff5 Mon Sep 17 00:00:00 2001
|
|
|
e88930 |
From: Nilesh Javali <njavali@marvell.com>
|
|
|
e88930 |
Date: Tue, 25 Jun 2019 01:05:01 -0400
|
|
|
e88930 |
Subject: [PATCH 1/1] iscsiuio: allow processing of iscsid requests in DHCP
|
|
|
e88930 |
failure condition
|
|
|
e88930 |
|
|
|
e88930 |
In the event of DHCP failure, killing of enable_nic_thread did not
|
|
|
e88930 |
process any iscsid requests leading to error,
|
|
|
e88930 |
iscsistart: Could not broadcast to uIP after 5 tries
|
|
|
e88930 |
and login failure to next active path.
|
|
|
e88930 |
Do not kill enable_nic_thread and allow further processing of iscsid
|
|
|
e88930 |
requests and performing login to next active path.
|
|
|
e88930 |
|
|
|
e88930 |
Signed-off-by: Nilesh Javali <njavali@marvell.com>
|
|
|
e88930 |
---
|
|
|
e88930 |
iscsiuio/src/unix/nic.c | 15 ---------------
|
|
|
e88930 |
1 file changed, 15 deletions(-)
|
|
|
e88930 |
|
|
|
e88930 |
diff --git a/iscsiuio/src/unix/nic.c b/iscsiuio/src/unix/nic.c
|
|
|
e88930 |
index bd415c2..f449935 100644
|
|
|
e88930 |
--- a/iscsiuio/src/unix/nic.c
|
|
|
e88930 |
+++ b/iscsiuio/src/unix/nic.c
|
|
|
e88930 |
@@ -1318,21 +1318,6 @@ static int do_acquisition(nic_t *nic, nic_interface_t *nic_iface,
|
|
|
e88930 |
/* For DHCPv4 failure, the ustack must be cleaned so
|
|
|
e88930 |
it can re-acquire on the next iscsid request */
|
|
|
e88930 |
uip_reset(&nic_iface->ustack);
|
|
|
e88930 |
-
|
|
|
e88930 |
- /* Signal that the device enable is
|
|
|
e88930 |
- done */
|
|
|
e88930 |
- pthread_cond_broadcast(&nic->enable_done_cond);
|
|
|
e88930 |
- pthread_mutex_unlock(&nic->nic_mutex);
|
|
|
e88930 |
-
|
|
|
e88930 |
- if (nic->enable_thread == INVALID_THREAD)
|
|
|
e88930 |
- goto dhcp_err;
|
|
|
e88930 |
-
|
|
|
e88930 |
- rc = pthread_cancel(nic->enable_thread);
|
|
|
e88930 |
- if (rc != 0)
|
|
|
e88930 |
- LOG_ERR(PFX "%s: Couldn't cancel "
|
|
|
e88930 |
- "enable nic thread", nic->log_name);
|
|
|
e88930 |
-dhcp_err:
|
|
|
e88930 |
- pthread_mutex_lock(&nic->nic_mutex);
|
|
|
e88930 |
goto error;
|
|
|
e88930 |
}
|
|
|
e88930 |
|
|
|
e88930 |
--
|
|
|
e88930 |
2.21.0
|
|
|
e88930 |
|