From 6666907869fb3bc7fe6a6025540db5b887c7a78b Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 1 Oct 2015 17:31:14 +0200 Subject: networkd: address - merge _change() into _configure() These functions are almost entirely the same, so avoid duplication. --- src/network/networkd-dhcp4.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/network/networkd-dhcp4.c') diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 5c91d9609f..6ba16581f8 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -299,9 +299,9 @@ static int dhcp4_update_address(Link *link, addr->prefixlen = prefixlen; addr->broadcast.s_addr = address->s_addr | ~netmask->s_addr; - /* use change rather than configure so that we will update the - * lifetime of an existing address if it has already been configured */ - r = address_change(addr, link, &dhcp4_address_handler); + /* allow reusing an existing address and simply update its lifetime + * in case it already exists */ + r = address_configure(addr, link, &dhcp4_address_handler, true); if (r < 0) return r; -- cgit v1.2.3-54-g00ecf