shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-09-16 17:45:36 +03:00
Code Activity

sd-dhcp6-client: drop unnecessary event_source_disable()

Browse Source 
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.
This commit is contained in:
Yu Watanabe
2022-02-07 02:48:03 +09:00
parent 3bb18e707c
commit 0f3b8b809c
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libsystemd-network/sd-dhcp6-client.c
View File

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