diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2015-02-17 18:05:32 +0100 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2015-02-17 18:16:07 +0100 |
| commit | 83e30358f2775b581a5501d14873e409285275f5 (patch) | |
| tree | 79e1df8777935d23989fc5bc516a889613613ead /src/libsystemd/sd-bus/bus-kernel.c | |
| parent | 4d2b1e0a3f98d8cf93beb943b05868b55231006a (diff) | |
bus: sync with kdbus
Pull in new kdbus changes, namely:
- EOVERFLOW is replaces by KDBUS_RECV_RETURN_DROPPED_MSGS
- ENOMSG is merged with EAGAIN for consistency
Diffstat (limited to 'src/libsystemd/sd-bus/bus-kernel.c')
| -rw-r--r-- | src/libsystemd/sd-bus/bus-kernel.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index e90ee449d9..df772036ee 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -1345,15 +1345,12 @@ int bus_kernel_read_message(sd_bus *bus, bool hint_priority, int64_t priority) { } r = ioctl(bus->input_fd, KDBUS_CMD_RECV, &recv); + if (recv.return_flags & KDBUS_RECV_RETURN_DROPPED_MSGS) + log_debug("%s: kdbus reports %" PRIu64 " dropped broadcast messages, ignoring.", strna(bus->description), (uint64_t) recv.dropped_msgs); if (r < 0) { if (errno == EAGAIN) return 0; - if (errno == EOVERFLOW) { - log_debug("%s: kdbus reports %" PRIu64 " dropped broadcast messages, ignoring.", strna(bus->description), (uint64_t) recv.dropped_msgs); - return 0; - } - return -errno; } |