shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

network: use sd_event stored in Manager

Browse Source
This commit is contained in:
Yu Watanabe 2020-10-04 07:43:41 +09:00
parent 2ffd6d73f9
commit 4cf8500067
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/networkd-address.c
View File

@ -1377,7 +1377,7 @@ static int ipv4_dad_configure(Link *link, Address *address) {
if (r < 0)
return r;
r = sd_ipv4acd_attach_event(address->acd, NULL, 0);
r = sd_ipv4acd_attach_event(address->acd, link->manager->event, 0);
if (r < 0)
return r;

2
src/network/networkd-dhcp4.c
View File

@ -623,7 +623,7 @@ static int configure_dhcpv4_duplicate_address_detection(Link *link) {
if (r < 0)
return r;
r = sd_ipv4acd_attach_event(link->network->dhcp_acd, NULL, 0);
r = sd_ipv4acd_attach_event(link->network->dhcp_acd, link->manager->event, 0);
if (r < 0)
return r;

2
src/network/networkd-dhcp6.c
View File

@ -1400,7 +1400,7 @@ int dhcp6_configure(Link *link) {
if (r < 0)
return log_link_error_errno(link, r, "DHCP6 CLIENT: Failed to create DHCP6 client: %m");
r = sd_dhcp6_client_attach_event(client, NULL, 0);
r = sd_dhcp6_client_attach_event(client, link->manager->event, 0);
if (r < 0)
return log_link_error_errno(link, r, "DHCP6 CLIENT: Failed to attach event: %m");

3
src/network/networkd-lldp-rx.c
View File

@ -9,6 +9,7 @@
#include "networkd-link.h"
#include "networkd-lldp-rx.h"
#include "networkd-lldp-tx.h"
#include "networkd-manager.h"
#include "networkd-network.h"
#include "string-table.h"
#include "string-util.h"
@ -76,7 +77,7 @@ int link_lldp_rx_configure(Link *link) {
if (r < 0)
return r;
r = sd_lldp_attach_event(link->lldp, NULL, 0);
r = sd_lldp_attach_event(link->lldp, link->manager->event, 0);
if (r < 0)
return r;
}

2
src/network/networkd-ndisc.c
View File

@ -1234,7 +1234,7 @@ int ndisc_configure(Link *link) {
if (r < 0)
return r;
r = sd_ndisc_attach_event(link->ndisc, NULL, 0);
r = sd_ndisc_attach_event(link->ndisc, link->manager->event, 0);
if (r < 0)
return r;
}

2
src/network/networkd-radv.c
View File

@ -624,7 +624,7 @@ int radv_configure(Link *link) {
if (r < 0)
return r;
r = sd_radv_attach_event(link->radv, NULL, 0);
r = sd_radv_attach_event(link->radv, link->manager->event, 0);
if (r < 0)
return r;