Merge pull request #29121 from yuwata/network-drop-duplicated

network: drop duplicated checks and function calls

src/network/networkd-address.c

@@ -240,7 +240,7 @@ void link_mark_addresses(Link *link, NetworkConfigSource source) {
         }
 }
 
-int address_get_broadcast(const Address *a, Link *link, struct in_addr *ret) {
+static int address_get_broadcast(const Address *a, Link *link, struct in_addr *ret) {
         struct in_addr b_addr = {};
 
         assert(a);
@@ -291,6 +291,11 @@ finalize:
         return in4_addr_is_set(&b_addr);
 }
 
+static void address_set_broadcast(Address *a, Link *link) {
+        assert(a);
+        assert_se(address_get_broadcast(a, link, &a->broadcast) >= 0);
+}
+
 static void address_set_cinfo(Manager *m, const Address *a, struct ifa_cacheinfo *cinfo) {
         usec_t now_usec;
 

src/network/networkd-address.h

@@ -83,11 +83,6 @@ int address_remove_and_drop(Address *address);
 int address_dup(const Address *src, Address **ret);
 bool address_is_ready(const Address *a);
 bool link_check_addresses_ready(Link *link, NetworkConfigSource source);
-int address_get_broadcast(const Address *a, Link *link, struct in_addr *ret);
-static inline void address_set_broadcast(Address *a, Link *link) {
-        assert(a);
-        assert_se(address_get_broadcast(a, link, &a->broadcast) >= 0);
-}
 
 DEFINE_SECTION_CLEANUP_FUNCTIONS(Address, address_free);
 

src/network/networkd-dhcp-server.c

@@ -107,7 +107,6 @@ int link_request_dhcp_server_address(Link *link) {
         address->family = AF_INET;
         address->in_addr.in = link->network->dhcp_server_address;
         address->prefixlen = link->network->dhcp_server_address_prefixlen;
-        address_set_broadcast(address, link);
 
         if (address_get_harder(link, address, &existing) >= 0 &&
             (address_exists(existing) || address_is_requesting(existing)) &&

src/network/networkd-dhcp4.c

@@ -959,7 +959,6 @@ static int dhcp4_request_address(Link *link, bool announce) {
         r = sd_dhcp_lease_get_broadcast(link->dhcp_lease, &addr->broadcast);
         if (r < 0 && r != -ENODATA)
                 return log_link_warning_errno(link, r, "DHCP: failed to get broadcast address: %m");
-        address_set_broadcast(addr, link);
         SET_FLAG(addr->flags, IFA_F_NOPREFIXROUTE, !link_prefixroute(link));
         addr->route_metric = link->network->dhcp_route_metric;
         addr->duplicate_address_detection = link->network->dhcp_send_decline ? ADDRESS_FAMILY_IPV4 : ADDRESS_FAMILY_NO;

src/network/networkd-ipv4ll.c

@@ -50,7 +50,6 @@ static int address_new_from_ipv4ll(Link *link, Address **ret) {
         address->prefixlen = 16;
         address->scope = RT_SCOPE_LINK;
         address->route_metric = IPV4LL_ROUTE_METRIC;
-        address_set_broadcast(address, link);
 
         *ret = TAKE_PTR(address);
         return 0;

src/network/networkd-network.c

@@ -181,11 +181,6 @@ int network_verify(Network *network) {
                                     network->filename);
                         network->link_local = ADDRESS_FAMILY_NO;
                 }
-                if (network->dhcp_server) {
-                        log_warning("%s: Cannot enable DHCPServer= when Bond= is specified, disabling DHCPServer=.",
-                                    network->filename);
-                        network->dhcp_server = false;
-                }
                 if (!ordered_hashmap_isempty(network->addresses_by_section))
                         log_warning("%s: Cannot set addresses when Bond= is specified, ignoring addresses.",
                                     network->filename);