X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-manager.c;h=e2c8a23e0f2d75d58b2bf1d4d75531e9c06e021c;hb=dbffab87f1504abc9f189dd253111693c99fbd9a;hp=02ab9f95efefc79caefdba8f9d9c81ac2da7a6de;hpb=a97dcc12e486ecff531809802930a26c4da827f2;p=elogind.git diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 02ab9f95e..e2c8a23e0 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -78,8 +78,6 @@ static int setup_default_address_pool(Manager *m) { return 0; } -int manager_connect_bus(Manager *m); - static int on_bus_retry(sd_event_source *s, usec_t usec, void *userdata) { Manager *m = userdata; @@ -437,10 +435,6 @@ int manager_new(Manager **ret) { if (r < 0) return r; - r = manager_connect_bus(m); - if (r < 0) - return r; - r = manager_connect_udev(m); if (r < 0) return r; @@ -487,6 +481,8 @@ void manager_free(Manager *m) { while ((network = m->networks)) network_free(network); + hashmap_free(m->networks_by_name); + while ((netdev = hashmap_first(m->netdevs))) netdev_unref(netdev); hashmap_free(m->netdevs);