diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-12-06 01:28:43 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-12-07 19:44:02 +0900 |
| commit | 2747f1321d14e4e705e9a9b7b38c31afcf1c6bc3 (patch) | |
| tree | 28104fe6dc5e99622e942e59adbf01a45e914485 | |
| parent | 57c107544de0c107f48f1da9aaeb4625cf27cbc6 (diff) | |
| download | systemd-2747f1321d14e4e705e9a9b7b38c31afcf1c6bc3.tar.gz | |
network: dhcp6pd: do not check Announce= setting when the link does not support RADV
| -rw-r--r-- | src/network/networkd-dhcp-prefix-delegation.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c index 2646aa65df..61df70fd55 100644 --- a/src/network/networkd-dhcp-prefix-delegation.c +++ b/src/network/networkd-dhcp-prefix-delegation.c @@ -534,7 +534,7 @@ static int dhcp6_pd_assign_prefix( (void) in6_addr_prefix_to_string(&prefix, 64, &buf); - if (link->network->dhcp6_pd_announce) { + if (link_radv_enabled(link) && link->network->dhcp6_pd_announce) { r = radv_add_prefix(link, &prefix, 64, lifetime_preferred_usec, lifetime_valid_usec); if (r < 0) return log_link_warning_errno(link, r, @@ -571,7 +571,7 @@ static int dhcp6_pd_prepare(Link *link) { if (!link_dhcp6_pd_is_enabled(link)) return 0; - if (link->network->dhcp6_pd_announce && !link->radv) + if (link_radv_enabled(link) && link->network->dhcp6_pd_announce && !link->radv) return 0; link_mark_addresses(link, NETWORK_CONFIG_SOURCE_DHCP6PD, NULL); |