network: use address_remove_and_drop()

diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c
index 9e39fa649ecc6cb1eaed61c4c734e6d7b545314b..8d50da042c83bd908f37052f7e9b26feac5a972b 100644 (file)
--- a/src/network/networkd-dhcp-prefix-delegation.c
+++ b/src/network/networkd-dhcp-prefix-delegation.c
@@ -216,11 +216,9 @@ int dhcp_pd_remove(Link *link, bool only_marked) {
 
                         link_remove_dhcp_pd_subnet_prefix(link, &prefix);
 
-                        k = address_remove(address);
+                        k = address_remove_and_drop(address);
                         if (k < 0)
                                 r = k;
-
-                        address_cancel_request(address);
                 }
         }
 

diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index fd72f734139cd6be3003453a615d820582a009e8..eeb3585f2936910c26411fad68335c748f9659ba 100644 (file)
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -258,11 +258,9 @@ static int dhcp4_remove_address_and_routes(Link *link, bool only_marked) {
                 if (only_marked && !address_is_marked(address))
                         continue;
 
-                k = address_remove(address);
+                k = address_remove_and_drop(address);
                 if (k < 0)
                         r = k;
-
-                address_cancel_request(address);
         }
 
         return r;

diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index 44c9a95f8d1c2021f8c68904dfe2b3010231e551..755957f5b19d7b70c4df6e4727de92fc03ae6d56 100644 (file)
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -72,11 +72,9 @@ static int dhcp6_remove(Link *link, bool only_marked) {
                 if (only_marked && !address_is_marked(address))
                         continue;
 
-                k = address_remove(address);
+                k = address_remove_and_drop(address);
                 if (k < 0)
                         r = k;
-
-                address_cancel_request(address);
         }
 
         return r;