diff options
author | Tom Gundersen <teg@jklm.no> | 2015-10-01 17:31:14 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2015-10-21 02:35:31 +0200 |
commit | 6666907869fb3bc7fe6a6025540db5b887c7a78b (patch) | |
tree | 7ccee1a1cd8290c11de5a4362daafd8360dbc921 /src/network/networkd-dhcp4.c | |
parent | 36c32f6120a0c3fe19be5aeaa1926e179e8c29ba (diff) |
networkd: address - merge _change() into _configure()
These functions are almost entirely the same, so avoid duplication.
Diffstat (limited to 'src/network/networkd-dhcp4.c')
-rw-r--r-- | src/network/networkd-dhcp4.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |