From: Ronan Pigott <ronan@rjp.ie>
Date: Wed, 25 Oct 2023 23:17:44 +0000 (-0700)
Subject: network: cleanup unreachable condition in dhcp client path
X-Git-Tag: v255-rc1~112^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5516b0dd20d8dd4e4093cd4fd0ef56a644a9808d;p=thirdparty%2Fsystemd.git

network: cleanup unreachable condition in dhcp client path

The client state is unconditionally set just above, making this
conditional unreachable.
---

diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index f056dcfc936..87d18269e41 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -1902,13 +1902,7 @@ static int client_enter_bound_now(sd_dhcp_client *client, int notify_event) {
         close_and_replace(client->fd, r);
         client_initialize_io_events(client, client_receive_message_udp);
 
-        if (IN_SET(client->state, DHCP_STATE_RENEWING, DHCP_STATE_REBINDING) &&
-            notify_event == SD_DHCP_CLIENT_EVENT_IP_ACQUIRE)
-                /* FIXME: hmm, maybe this is a bug... */
-                log_dhcp_client(client, "client_handle_ack() returned SD_DHCP_CLIENT_EVENT_IP_ACQUIRE while DHCP client is %s the address, skipping callback.",
-                                client->state == DHCP_STATE_RENEWING ? "renewing" : "rebinding");
-        else
-                client_notify(client, notify_event);
+        client_notify(client, notify_event);
 
         return 0;
 }