diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-06-16 13:56:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-16 13:56:23 +0200 |
| commit | 616aab60855dc2d84a5ad8b52aa4ecab182d7f18 (patch) | |
| tree | d0158d6562235838f29a963f272b95fb6c77bfde /src/libsystemd-network | |
| parent | 732cd53eebdcefa1484c43a99455904b3692f9a4 (diff) | |
| parent | 0e2e03c67a8b9df2ae7c785741b2b5ac7a2a4f2b (diff) | |
Merge pull request #3481 from poettering/relative-memcg
various changes, most importantly regarding memory metrics
Diffstat (limited to 'src/libsystemd-network')
| -rw-r--r-- | src/libsystemd-network/sd-ndisc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c index ea3fe369ce..07b0d7f704 100644 --- a/src/libsystemd-network/sd-ndisc.c +++ b/src/libsystemd-network/sd-ndisc.c @@ -307,7 +307,7 @@ static int ndisc_recv(sd_event_source *s, int fd, uint32_t revents, void *userda if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SO_TIMESTAMP && cmsg->cmsg_len == CMSG_LEN(sizeof(struct timeval))) - triple_timestamp_from_realtime(&rt->timestamp, timeval_load(CMSG_DATA(cmsg))); + triple_timestamp_from_realtime(&rt->timestamp, timeval_load((struct timeval*) CMSG_DATA(cmsg))); } if (!triple_timestamp_is_set(&rt->timestamp)) |