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/src | |
| 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/src')
| -rw-r--r-- | iscsiuio/src/unix/nic.c | 15 |
1 files changed, 0 insertions, 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; } |