From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 4 Dec 2021 18:37:52 +0000 (+0900)
Subject: network: dhcp6pd: also drop prefix assigned to upstream interface
X-Git-Tag: v250-rc1~60^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d44187ce66ff10ce150713f468845a3dcbea783;p=thirdparty%2Fsystemd.git

network: dhcp6pd: also drop prefix assigned to upstream interface

But do not drop prefixes from downstream which request another uplink.
---

diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c
index dc4868300a8..85de6757f66 100644
--- a/src/network/networkd-dhcp-prefix-delegation.c
+++ b/src/network/networkd-dhcp-prefix-delegation.c
@@ -662,7 +662,7 @@ void dhcp6_pd_prefix_lost(Link *dhcp6_link) {
         assert(dhcp6_link->manager);
 
         HASHMAP_FOREACH(link, dhcp6_link->manager->links_by_index) {
-                if (link == dhcp6_link)
+                if (!dhcp6_pd_is_uplink(link, dhcp6_link, /* accept_auto = */ true))
                         continue;
 
                 r = dhcp6_pd_remove(link, /* only_marked = */ false);