]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-dhcp6-client: drop unnecessary event_source_disable()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 6 Feb 2022 17:48:03 +0000 (02:48 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 14 Feb 2022 05:51:19 +0000 (14:51 +0900)
The event source will be soon re-enabled in the same function.

The function client_timeout_resend() may return earlier without
re-enabling the timer souce. However,
- the timer event source is one shot by default. Hence, it is not
  necessary to disable in the callback function,
- when it returns early, then client_set_state() or client_stop() is
  called before return, and they re-ernable or disable the timer.

src/libsystemd-network/sd-dhcp6-client.c

index 0ebe9f503be911e812fa95607e6efe270d49ca44..95ec78d82836c635a49d4d4cff751629d06ebbb0 100644 (file)
@@ -951,8 +951,6 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda
         assert(s);
         assert(client->event);
 
-        (void) event_source_disable(client->timeout_resend);
-
         switch (client->state) {
         case DHCP6_STATE_INFORMATION_REQUEST:
                 init_retransmit_time = DHCP6_INF_TIMEOUT;
@@ -1342,7 +1340,6 @@ static int client_set_state(sd_dhcp6_client *client, DHCP6State state) {
                 assert_not_reached();
         }
 
-        (void) event_source_disable(client->timeout_resend);
         client->retransmit_time = 0;
         client->retransmit_count = 0;