summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAndrew Collins <bsderandrew@gmail.com>2013-06-17 21:58:43 (GMT)
committerThomas Graf <tgraf@suug.ch>2013-06-26 23:12:36 (GMT)
commit53ac502a2b2794e4339527b33158a6c3e851a83b (patch)
tree30b9bb0ffe2f35a74dc6266ab2895c74a154df11 /lib
parent87bbfb6b12322d79abc979d6a001c18eb875ae45 (diff)
downloadlibnl-53ac502a2b2794e4339527b33158a6c3e851a83b.zip
libnl-53ac502a2b2794e4339527b33158a6c3e851a83b.tar.gz
libnl-53ac502a2b2794e4339527b33158a6c3e851a83b.tar.bz2
Handle -NLE_AGAIN in nl_cache_mngr_data_ready
Since commit "nl: Return -NLE_AGAIN if non-blocking socket would block", nl_cache_mngr_data_ready returns -NLE_AGAIN to callers on non-blocking sockets. Change it to consider -NLE_AGAIN as a non-error case as it is expected behavior with the nl_recv changes. Signed-off-by: Thomas Graf <tgraf@suug.ch>
Diffstat (limited to 'lib')
-rw-r--r--lib/cache_mngr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/cache_mngr.c b/lib/cache_mngr.c
index f8a65e3..7fb1ed0 100644
--- a/lib/cache_mngr.c
+++ b/lib/cache_mngr.c
@@ -435,7 +435,7 @@ int nl_cache_mngr_data_ready(struct nl_cache_mngr *mngr)
}
nl_cb_put(cb);
- if (err < 0)
+ if (err < 0 && err != -NLE_AGAIN)
return err;
return nread;