diff options
| author | Lee Duncan <leeman.duncan@gmail.com> | 2019-07-02 13:03:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-02 13:03:31 -0400 |
| commit | b8232b9e43a6d3dc5266e385406d1742b20bef7b (patch) | |
| tree | 31a9f431f09d94bf8a5d3ae7d9daf58c618dfdbc /iscsiuio | |
| parent | 655b636528ebf0934d79dc952a6af86047f45af3 (diff) | |
| parent | fb7e87dbe5bad120c88f7e430dfdc627d247fa4c (diff) | |
| download | open-iscsi-b8232b9e43a6d3dc5266e385406d1742b20bef7b.tar.gz | |
Merge pull request #169 from njavali/iscsiuio-bug-fixes
iscsiuio bug fix
Diffstat (limited to 'iscsiuio')
| -rw-r--r-- | iscsiuio/README | 4 | ||||
| -rw-r--r-- | iscsiuio/RELEASE.TXT | 19 | ||||
| -rw-r--r-- | iscsiuio/configure.ac | 4 | ||||
| -rw-r--r-- | iscsiuio/src/unix/nic.c | 15 |
4 files changed, 21 insertions, 21 deletions
diff --git a/iscsiuio/README b/iscsiuio/README index 1915005..53b700c 100644 --- a/iscsiuio/README +++ b/iscsiuio/README @@ -1,6 +1,6 @@ Iscsiuio Userspace Tool -Version 0.7.8.5 -Nov 20, 2018 +Version 0.7.8.6 +Jun 27, 2019 ------------------------------------------------------ This tool is to be used in conjunction with the QLogic NetXtreme II Linux diff --git a/iscsiuio/RELEASE.TXT b/iscsiuio/RELEASE.TXT index 0ebf27f..28e681b 100644 --- a/iscsiuio/RELEASE.TXT +++ b/iscsiuio/RELEASE.TXT @@ -1,7 +1,7 @@ Release Notes QLogic uIP Linux Driver - Version 0.7.8.5 - 11/20/2018 + Version 0.7.8.6 + 06/27/2019 QLogic Corporation 26650 Aliso Viejo Pkwy, @@ -11,6 +11,21 @@ Copyright (c) 2014, QLogic Corporation All rights reserved +uIP v0.7.8.6 (Jun 27, 2019) +======================================================= + Fixes: + ------- + 1. Problem: OS fails to boot after one path is + disconnected from iSCSI MPIO config. + Change: 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 of active path. + Added fix to not kill enable_nic_thread and allow further + processing of iscsid requests and performing login + to next active path. + Impact: All + uIP v0.7.8.5 (Nov 20, 2018) ======================================================= Fixes: diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac index 096573b..b41df0e 100644 --- a/iscsiuio/configure.ac +++ b/iscsiuio/configure.ac @@ -12,9 +12,9 @@ dnl Benjamin Li (benli@broadcom.com) dnl PACKAGE=iscsiuio -VERSION=0.7.8.5 +VERSION=0.7.8.6 -AC_INIT([iscsiuio], [0.7.8.5], [QLogic-Storage-Upstream@cavium.com]) +AC_INIT([iscsiuio], [0.7.8.6], [QLogic-Storage-Upstream@cavium.com]) AM_INIT_AUTOMAKE AC_CONFIG_HEADER(config.h) 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; } |