diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-10-04 07:43:41 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-10-07 02:50:51 +0900 |
| commit | 4cf85000674032f27910718ec264f8a124fa3e48 (patch) | |
| tree | 7b62bc94b4508cee72b49c9a14faa58956505ece | |
| parent | 2ffd6d73f946d3d1619e06301b71482f2c60b078 (diff) | |
| download | systemd-4cf85000674032f27910718ec264f8a124fa3e48.tar.gz | |
network: use sd_event stored in Manager
| -rw-r--r-- | src/network/networkd-address.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-dhcp4.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-dhcp6.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-lldp-rx.c | 3 | ||||
| -rw-r--r-- | src/network/networkd-ndisc.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-radv.c | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 8fc6ca6404..2f93a6ea46 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -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; diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index a20f06d6c3..d4a8f98570 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -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; diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index ce9f6ac300..ea331c95db 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -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"); diff --git a/src/network/networkd-lldp-rx.c b/src/network/networkd-lldp-rx.c index a97bdeda19..65a8a314d6 100644 --- a/src/network/networkd-lldp-rx.c +++ b/src/network/networkd-lldp-rx.c @@ -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; } diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index a60c42528b..2599ec2232 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -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; } diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c index dbdbdef80d..bf906d517b 100644 --- a/src/network/networkd-radv.c +++ b/src/network/networkd-radv.c @@ -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; |