diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-12-13 10:15:04 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-12-16 20:14:15 +0100 |
| commit | 7ad1301ec555ca3bd48d59767456ee1de3b73242 (patch) | |
| tree | 65c92af68ffe8fc63efa3bc8f2970832d310a969 | |
| parent | 5ac2f5644a602ca72659d6130b26906d6832b245 (diff) | |
| download | NetworkManager-7ad1301ec555ca3bd48d59767456ee1de3b73242.tar.gz | |
platform: cleanup event_handler_recvmsg() (inline event_err())
| -rw-r--r-- | src/platform/nm-linux-platform.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index e584d4551f..3836de4449 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -3304,15 +3304,6 @@ event_seq_check (NMPlatform *platform, struct nl_msg *msg) _LOGt ("sequence-number: seq %u received (wait for %u)", hdr->nlmsg_seq, priv->nlh_seq_last); } -static void -event_err (struct sockaddr_nl *nla, struct nlmsgerr *nlerr, gpointer platform) -{ - _LOGt ("event_err(): error from kernel: %s (%d) for request %d", - strerror (nlerr ? -nlerr->error : 0), - nlerr ? -nlerr->error : 0, - NM_LINUX_PLATFORM_GET_PRIVATE (platform)->nlh_seq_last); -} - /* This function does all the magic to avoid race conditions caused * by concurrent usage of synchronous commands and an asynchronous cache. This * might be a nice future addition to libnl but it requires to do all operations @@ -5503,7 +5494,10 @@ continue_reading: goto out; } else if (e->error) { /* Error message reported back from kernel. */ - event_err (&nla, e, platform); + _LOGt ("event_err(): error from kernel: %s (%d) for request %d", + strerror (e->error), + e->error, + priv->nlh_seq_last); } } else { /* Valid message (not checking for MULTIPART bit to |