diff options
| author | David Herrmann <dh.herrmann@googlemail.com> | 2016-11-14 12:08:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-14 12:08:38 +0100 |
| commit | 46b6025a8881b50373a3730598c8caa46be537f0 (patch) | |
| tree | 4dad164d2a1b0322f2f277ba04153636eee87648 /src/network/networkd-link.c | |
| parent | 2a49b6120f0ba3e07cef964d8a4b321bd49655c9 (diff) | |
| parent | 23f53b99b17f1b8dc755a6c0fff41b1ed3069467 (diff) | |
Merge pull request #4665 from teg/networkd-split-1
networkd: split sources into subdirectories
Diffstat (limited to 'src/network/networkd-link.c')
| -rw-r--r-- | src/network/networkd-link.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index aefe7335b9..0b634572a9 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -29,8 +29,8 @@ #include "netlink-util.h" #include "network-internal.h" #include "networkd-lldp-tx.h" +#include "networkd-manager.h" #include "networkd-ndisc.h" -#include "networkd.h" #include "set.h" #include "socket-util.h" #include "stdio-util.h" @@ -2632,7 +2632,7 @@ static int link_initialized_and_synced(sd_netlink *rtnl, sd_netlink_message *m, log_link_debug(link, "Ignoring DHCP server for loopback link"); } - r = network_apply(link->manager, network, link); + r = network_apply(network, link); if (r < 0) return r; } @@ -2728,7 +2728,7 @@ static int link_load(Link *link) { goto network_file_fail; } - r = network_apply(link->manager, network, link); + r = network_apply(network, link); if (r < 0) return log_link_error_errno(link, r, "Failed to apply network %s: %m", basename(network_file)); } |