From 42152390dab7c01c181fd1ee008973aa16ec47ce Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 7 Nov 2024 10:13:37 +0900 Subject: [PATCH] network: reorder dropping dynamic configuration Follow-up for 451c2baf30f50b95d73e648058c7c2348dbf0c31. --- src/network/networkd-link.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index f9047103c01..990203b528b 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1127,11 +1127,11 @@ static int link_drop_dynamic_config(Link *link, Network *network) { * previously DHCP=yes and now DHCP=no, but keep DHCP lease when DHCP setting is unchanged. */ r = link_drop_ndisc_config(link, network); - RET_GATHER(r, link_drop_radv_config(link, network)); + RET_GATHER(r, link_drop_radv_config(link, network)); /* Stop before dropping DHCP-PD prefixes. */ + RET_GATHER(r, link_drop_ipv4ll_config(link, network)); /* Stop before DHCPv4 client. */ RET_GATHER(r, link_drop_dhcp4_config(link, network)); RET_GATHER(r, link_drop_dhcp6_config(link, network)); RET_GATHER(r, link_drop_dhcp_pd_config(link, network)); - RET_GATHER(r, link_drop_ipv4ll_config(link, network)); link->dhcp_server = sd_dhcp_server_unref(link->dhcp_server); link->lldp_rx = sd_lldp_rx_unref(link->lldp_rx); /* TODO: keep the received neighbors. */ link->lldp_tx = sd_lldp_tx_unref(link->lldp_tx);