From 2747f1321d14e4e705e9a9b7b38c31afcf1c6bc3 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 6 Dec 2021 01:28:43 +0900 Subject: [PATCH] network: dhcp6pd: do not check Announce= setting when the link does not support RADV --- src/network/networkd-dhcp-prefix-delegation.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c index 2646aa65df0..61df70fd55d 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); -- 2.47.3