chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: fix compile
[elogind.git]
/
src
/
network
/
networkd-wait-online-link.c
diff --git
a/src/network/networkd-wait-online-link.c
b/src/network/networkd-wait-online-link.c
index 47fb0c05dfcae2e5e6a3cce762e0f7600069e10d..268ab676c958b56cb5884bcf8e45d453a35dcc15 100644
(file)
--- 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);
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;
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;
if (r < 0)
return r;
@@
-126,12
+125,12
@@
int link_update_monitor(Link *l) {
free(l->operational_state);
l->operational_state = NULL;
free(l->operational_state);
l->operational_state = NULL;
- sd_network_
get_link
_operational_state(l->ifindex, &l->operational_state);
+ sd_network_
link_get
_operational_state(l->ifindex, &l->operational_state);
free(l->state);
l->state = NULL;
free(l->state);
l->state = NULL;
- sd_network_
get_link
_state(l->ifindex, &l->state);
+ sd_network_
link_get_setup
_state(l->ifindex, &l->state);
return 0;
}
return 0;
}