diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-10-25 00:15:06 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-10-27 16:13:09 +0900 |
| commit | 7003b11487e70a1b127947fe6f93959d12c974cb (patch) | |
| tree | 4cf0c49a728c5a6205e13c9c5805d4a1d6a81e82 /src/network/networkd-radv.c | |
| parent | cfee6b955154c30be31ffcf0e3b7b89374a52fff (diff) | |
| download | systemd-7003b11487e70a1b127947fe6f93959d12c974cb.tar.gz | |
sd-radv: make sd_radv_set_router_lifetime() take usec_t (uint64_t)
Diffstat (limited to 'src/network/networkd-radv.c')
| -rw-r--r-- | src/network/networkd-radv.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c index a290b3730a..7b92e6c4f9 100644 --- a/src/network/networkd-radv.c +++ b/src/network/networkd-radv.c @@ -429,7 +429,6 @@ static int radv_find_uplink(Link *link, Link **ret) { } static int radv_configure(Link *link) { - uint16_t router_lifetime; Link *uplink = NULL; RoutePrefix *q; Prefix *p; @@ -465,19 +464,11 @@ static int radv_configure(Link *link) { if (r < 0) return r; - /* a value of UINT16_MAX represents infinity, 0x0 means this host is not a router */ - if (link->network->router_lifetime_usec == USEC_INFINITY) - router_lifetime = UINT16_MAX; - else if (link->network->router_lifetime_usec > (UINT16_MAX - 1) * USEC_PER_SEC) - router_lifetime = UINT16_MAX - 1; - else - router_lifetime = DIV_ROUND_UP(link->network->router_lifetime_usec, USEC_PER_SEC); - - r = sd_radv_set_router_lifetime(link->radv, router_lifetime); + r = sd_radv_set_router_lifetime(link->radv, link->network->router_lifetime_usec); if (r < 0) return r; - if (router_lifetime > 0) { + if (link->network->router_lifetime_usec > 0) { r = sd_radv_set_preference(link->radv, link->network->router_preference); if (r < 0) return r; |