diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index 39471d6628d..f1ecf642051 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -297,7 +297,7 @@ static int dhcp6_request_hostname(Link *link) { return 0; } -static int dhcp6_lease_ip_acquired(sd_dhcp6_client *client, Link *link) { +static int dhcp6_lease_acquired(sd_dhcp6_client *client, Link *link) { _cleanup_(sd_dhcp6_lease_unrefp) sd_dhcp6_lease *lease_old = NULL; sd_dhcp6_lease *lease; int r; @@ -341,22 +341,6 @@ static int dhcp6_lease_ip_acquired(sd_dhcp6_client *client, Link *link) { link_set_state(link, LINK_STATE_CONFIGURING); link_check_ready(link); - return 0; -} - -static int dhcp6_lease_information_acquired(sd_dhcp6_client *client, Link *link) { - sd_dhcp6_lease *lease; - int r; - - assert(client); - assert(link); - - r = sd_dhcp6_client_get_lease(client, &lease); - if (r < 0) - return log_link_error_errno(link, r, "Failed to get DHCPv6 lease: %m"); - - unref_and_replace_full(link->dhcp6_lease, lease, sd_dhcp6_lease_ref, sd_dhcp6_lease_unref); - link_dirty(link); return 0; } @@ -401,11 +385,8 @@ static void dhcp6_handler(sd_dhcp6_client *client, int event, void *userdata) { break; case SD_DHCP6_CLIENT_EVENT_IP_ACQUIRE: - r = dhcp6_lease_ip_acquired(client, link); - break; - case SD_DHCP6_CLIENT_EVENT_INFORMATION_REQUEST: - r = dhcp6_lease_information_acquired(client, link); + r = dhcp6_lease_acquired(client, link); break; default: