diff options
| author | Lee Duncan <leeman.duncan@gmail.com> | 2018-09-26 11:04:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-26 11:04:02 -0700 |
| commit | 1c870637f946698e2c247318315554ddbe89337d (patch) | |
| tree | 948cbf86bda6aa0f538fd0445bad6130ab9b86bd /iscsiuio | |
| parent | ba956406d2bb6e22d998f2e5b6a9a6e3031ebee9 (diff) | |
| parent | 40c4319fd3100dcbf97880508c869978dff8f818 (diff) | |
| download | open-iscsi-1c870637f946698e2c247318315554ddbe89337d.tar.gz | |
Merge pull request #129 from cpaelzer/cleanup-nic_nl_open-usage
Cleanup nic nl open usage
Diffstat (limited to 'iscsiuio')
| -rw-r--r-- | iscsiuio/src/unix/main.c | 3 | ||||
| -rw-r--r-- | iscsiuio/src/unix/nic_nl.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/iscsiuio/src/unix/main.c b/iscsiuio/src/unix/main.c index 457ebe3..39d5339 100644 --- a/iscsiuio/src/unix/main.c +++ b/iscsiuio/src/unix/main.c @@ -394,7 +394,8 @@ int main(int argc, char *argv[]) goto error; /* NetLink connection to listen to NETLINK_ISCSI private messages */ - nic_nl_open(); + if (nic_nl_open() != 0) + goto error; error: cleanup(); diff --git a/iscsiuio/src/unix/nic_nl.c b/iscsiuio/src/unix/nic_nl.c index 1a920c7..6588432 100644 --- a/iscsiuio/src/unix/nic_nl.c +++ b/iscsiuio/src/unix/nic_nl.c @@ -534,7 +534,7 @@ static void flush_nic_nl_process_ring(nic_t *nic) */ int nic_nl_open() { - int rc; + int rc = 0; char *msg_type_str; /* Prepare the thread to issue the ARP's */ @@ -676,5 +676,5 @@ int nic_nl_open() rc = 0; error: - return 0; + return rc; } |