chiark / gitweb /
networkd: don't filter on udev tags
[elogind.git] / src / network / networkd-network.c
index 69c55edb8fe3ef588bb5d13a45a3817cb332c581..d4239ab8d0f80479bd892661c97d83fa0bb5ae6a 100644 (file)
@@ -56,6 +56,8 @@ static int network_load_one(Manager *manager, const char *filename) {
         if (!network->filename)
                 return log_oom();
 
+        network->manager = manager;
+
         LIST_PREPEND(networks, manager->networks, network);
         network = NULL;
 
@@ -157,8 +159,6 @@ int network_get(Manager *manager, struct udev_device *device, Network **ret) {
 }
 
 int network_apply(Manager *manager, Network *network, Link *link) {
-        Address *address;
-        Route *route;
         int r;
 
         log_info("Network '%s' being applied to link '%u'",
@@ -166,21 +166,9 @@ int network_apply(Manager *manager, Network *network, Link *link) {
 
         link->network = network;
 
-        LIST_FOREACH(addresses, address, network->addresses) {
-                r = address_configure(manager, address, link);
-                if (r < 0)
-                        return r;
-        }
-
-        r = link_up(manager, link);
+        r = link_configure(link);
         if (r < 0)
                 return r;
 
-        LIST_FOREACH(routes, route, network->routes) {
-                r = route_configure(manager, route, link);
-                if (r < 0)
-                        return r;
-        }
-
         return 0;
 }