From da94a69b8d1044c127271d13ac0087ce388749dc Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 30 Mar 2022 01:04:26 +0900 Subject: [PATCH] network: shorten code a bit Currently, there exist only two MTU sources, static and DHCPv4, and they are exclusive. Hence, it is not necessary to check the existence of the MTU option in the acquired DHCP lease. Let's unconditionally reset the MTU. Note that, if the current and original MTU are equivalent, then link_request_to_set_mtu() handles that gracefully. --- src/network/networkd-dhcp4.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 6bfcf67dd95..d3fd2571e0d 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -735,7 +735,6 @@ static int dhcp4_request_routes(Link *link) { } static int dhcp_reset_mtu(Link *link) { - uint16_t mtu; int r; assert(link); @@ -743,18 +742,9 @@ static int dhcp_reset_mtu(Link *link) { if (!link->network->dhcp_use_mtu) return 0; - r = sd_dhcp_lease_get_mtu(link->dhcp_lease, &mtu); - if (r == -ENODATA) - return 0; - if (r < 0) - return log_link_error_errno(link, r, "DHCP error: failed to get MTU from lease: %m"); - - if (link->original_mtu == mtu) - return 0; - r = link_request_to_set_mtu(link, link->original_mtu); if (r < 0) - return log_link_error_errno(link, r, "DHCP error: could not reset MTU: %m"); + return log_link_error_errno(link, r, "DHCP error: Could not queue request to reset MTU: %m"); return 0; } -- 2.47.3