diff options
| author | Luca Boccassi <bluca@debian.org> | 2022-07-18 11:02:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-18 11:02:02 +0200 |
| commit | 9b9ddaf09d8f71a159549614f8115f8e6abf2fb5 (patch) | |
| tree | f411ecaa9f54c5ad640f28537dc5e9e92f5f2aa1 /src/network/networkd-dhcp6.c | |
| parent | Merge pull request #24047 from dtardon/list-users-linger (diff) | |
| parent | network: refuse to configure address or route with 0 valid lifetime (diff) | |
| download | systemd-9b9ddaf09d8f71a159549614f8115f8e6abf2fb5.tar.xz systemd-9b9ddaf09d8f71a159549614f8115f8e6abf2fb5.zip | |
Merge pull request #24001 from yuwata/network-lifetime-fix
network: fixes for lifetime handling
Diffstat (limited to 'src/network/networkd-dhcp6.c')
| -rw-r--r-- | src/network/networkd-dhcp6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index 72ec6826bd..d6f2c2cca3 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -266,8 +266,8 @@ static int dhcp6_address_acquired(Link *link) { break; r = dhcp6_request_address(link, &server_address, &ip6_addr, - usec_add(lifetime_preferred_sec * USEC_PER_SEC, timestamp_usec), - usec_add(lifetime_valid_sec * USEC_PER_SEC, timestamp_usec)); + sec_to_usec(lifetime_preferred_sec, timestamp_usec), + sec_to_usec(lifetime_valid_sec, timestamp_usec)); if (r < 0) return r; } |