X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-wait-online-link.c;h=268ab676c958b56cb5884bcf8e45d453a35dcc15;hb=2e5c94b9aaefce46835b623e800cfc168995ea3f;hp=1670beefab24501ff09639a300adcf865bd3fc41;hpb=d6731e4c7964ee2860d4f5abdb0b52acd7a66960;p=elogind.git diff --git a/src/network/networkd-wait-online-link.c b/src/network/networkd-wait-online-link.c index 1670beefa..268ab676c 100644 --- a/src/network/networkd-wait-online-link.c +++ b/src/network/networkd-wait-online-link.c @@ -34,12 +34,11 @@ int link_new(Manager *m, Link **ret, int ifindex, const char *ifname) { assert(m); assert(ifindex > 0); - r = hashmap_ensure_allocated(&m->links, NULL, NULL); + r = hashmap_ensure_allocated(&m->links, NULL); if (r < 0) return r; - r = hashmap_ensure_allocated(&m->links_by_name, - string_hash_func, string_compare_func); + r = hashmap_ensure_allocated(&m->links_by_name, &string_hash_ops); if (r < 0) return r; @@ -131,7 +130,7 @@ int link_update_monitor(Link *l) { free(l->state); l->state = NULL; - sd_network_link_get_state(l->ifindex, &l->state); + sd_network_link_get_setup_state(l->ifindex, &l->state); return 0; }