diff options
| author | Tom Gundersen <teg@jklm.no> | 2016-09-28 12:32:31 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2016-11-13 01:02:46 +0100 |
| commit | 7d342c03322ee1ffb97fd608ce697ec911f7815a (patch) | |
| tree | 1f5f6bb7200174a6762cd01b8a020ec2c5a13822 | |
| parent | 1f8c78a1bab2e06a462894fa89d842ffc313832d (diff) | |
networkd: network - apply() does not need to take the manager object
| -rw-r--r-- | src/network/networkd-link.c | 4 | ||||
| -rw-r--r-- | src/network/networkd-network.c | 3 | ||||
| -rw-r--r-- | src/network/networkd-network.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index aefe7335b9..bae75aca6f 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -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)); } diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 0dc00e874d..670d583e37 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -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); diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h index 4df8c37979..929e0b3b4e 100644 --- a/src/network/networkd-network.h +++ b/src/network/networkd-network.h @@ -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); |