From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 19 May 2021 07:17:19 +0000 (+0900)
Subject: network: drop unnecessary call of manager_rtnl_process_address()
X-Git-Tag: v249-rc1~199^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a1dfdb43f539df19ba1a8500e5c5682dcbf4d05;p=thirdparty%2Fsystemd.git

network: drop unnecessary call of manager_rtnl_process_address()

The reply should be NLMSG_DONE or NLMSG_ERROR.
Moreover, calling the function for reply of address label configuration
is completely wrong.
---

diff --git a/src/network/networkd-address-label.c b/src/network/networkd-address-label.c
index 9c9d2838688..3152cbcca90 100644
--- a/src/network/networkd-address-label.c
+++ b/src/network/networkd-address-label.c
@@ -82,8 +82,7 @@ static int address_label_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *
                 log_link_message_warning_errno(link, m, r, "Could not set address label");
                 link_enter_failed(link);
                 return 1;
-        } else if (r >= 0)
-                (void) manager_rtnl_process_address(rtnl, m, link->manager);
+        }
 
         if (link->address_label_messages == 0)
                 log_link_debug(link, "Addresses label set");
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 79a90293dca..1a7e626f081 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -669,8 +669,6 @@ static int address_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Link
         r = sd_netlink_message_get_errno(m);
         if (r < 0 && r != -EADDRNOTAVAIL)
                 log_link_message_warning_errno(link, m, r, "Could not drop address");
-        else if (r >= 0)
-                (void) manager_rtnl_process_address(rtnl, m, link->manager);
 
         return 1;
 }
@@ -925,8 +923,7 @@ int address_configure_handler_internal(sd_netlink *rtnl, sd_netlink_message *m,
                 log_link_message_warning_errno(link, m, r, error_msg);
                 link_enter_failed(link);
                 return 0;
-        } else if (r >= 0)
-                (void) manager_rtnl_process_address(rtnl, m, link->manager);
+        }
 
         return 1;
 }