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: don't warn about missing links unnecessarily
[elogind.git]
/
src
/
network
/
networkd-dhcp4.c
diff --git
a/src/network/networkd-dhcp4.c
b/src/network/networkd-dhcp4.c
index ac59fd48c80e97546628aed7a576a1ae8ff2c3bd..c3d0e3d39d621a06ce4133d8c431373fbeba6c1b 100644
(file)
--- a/
src/network/networkd-dhcp4.c
+++ b/
src/network/networkd-dhcp4.c
@@
-296,11
+296,8
@@
static int dhcp4_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m,
log_link_error(link, "could not set DHCPv4 address: %s",
strerror(-r));
link_enter_failed(link);
log_link_error(link, "could not set DHCPv4 address: %s",
strerror(-r));
link_enter_failed(link);
- } else if (r >= 0) {
- /* calling handler directly so take a ref */
- link_ref(link);
- link_get_address_handler(rtnl, m, link);
- }
+ } else if (r >= 0)
+ link_rtnl_process_address(rtnl, m, link->manager);
link_set_dhcp_routes(link);
link_set_dhcp_routes(link);
@@
-589,7
+586,7
@@
int dhcp4_configure(Link *link) {
assert(link);
assert(link->network);
assert(link);
assert(link->network);
- assert(IN_SET(link->network->dhcp,
DHCP_SUPPORT_BOTH, DHCP_SUPPORT_
V4));
+ assert(IN_SET(link->network->dhcp,
ADDRESS_FAMILY_YES, ADDRESS_FAMILY_IP
V4));
r = sd_dhcp_client_new(&link->dhcp_client);
if (r < 0)
r = sd_dhcp_client_new(&link->dhcp_client);
if (r < 0)