picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

networkd: network - apply() does not need to take the manager object

This commit is contained in:
Tom Gundersen 2016-09-28 12:32:31 +02:00
parent 1f8c78a1ba
commit 7d342c0332
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/networkd-link.c
View File

@ -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));
}

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

@ -368,10 +368,9 @@ int network_get(Manager *manager, struct udev_device *device,
return -ENOENT;
}
int network_apply(Manager *manager, Network *network, Link *link) {
int network_apply(Network *network, Link *link) {
int r;
assert(manager);
assert(network);
assert(link);

2
src/network/networkd-network.h
View File

@ -213,7 +213,7 @@ int network_load(Manager *manager);
int network_get_by_name(Manager *manager, const char *name, Network **ret);
int network_get(Manager *manager, struct udev_device *device, const char *ifname, const struct ether_addr *mac, Network **ret);
int network_apply(Manager *manager, Network *network, Link *link);
int network_apply(Network *network, Link *link);
bool network_has_static_ipv6_addresses(Network *network);