diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-08-03 17:57:26 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-08-03 17:57:26 +0200 |
| commit | 6934f402cded89a988e8d7f93bf0b7b4eb8f17f3 (patch) | |
| tree | 0decd0bdddc5a9be1ea76ce38c756ec85e42ab94 /src/libsystemd-network/sd-pppoe.c | |
| parent | 5ef9b2203e027da168b18d92045462422895565b (diff) | |
| parent | 38a03f06a7393d2721c23f23f0589d2f6d0904af (diff) | |
Merge pull request #843 from poettering/clock-boottime
sd-event: make sure sd_event_now() cannot fail
Diffstat (limited to 'src/libsystemd-network/sd-pppoe.c')
| -rw-r--r-- | src/libsystemd-network/sd-pppoe.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libsystemd-network/sd-pppoe.c b/src/libsystemd-network/sd-pppoe.c index 1de8a5e8bf..ff064f563f 100644 --- a/src/libsystemd-network/sd-pppoe.c +++ b/src/libsystemd-network/sd-pppoe.c @@ -346,9 +346,7 @@ static int pppoe_arm_timeout(sd_pppoe *ppp) { assert(ppp); r = sd_event_now(ppp->event, clock_boottime_or_monotonic(), &next_timeout); - if (r == -ENODATA) - next_timeout = now(clock_boottime_or_monotonic()); - else if (r < 0) + if (r < 0) return r; next_timeout += 500 * USEC_PER_MSEC; |