shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 17:51:22 +03:00
Code

network: simplify code a bit

Browse Source
This commit is contained in:
Yu Watanabe 2021-09-08 15:37:48 +09:00
parent c54e851acb
commit 2c40a8895e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/networkd-address.c
View File

@ -436,6 +436,7 @@ static int address_add(Link *link, const Address *in, Address **ret) {
}
static int address_update(Address *address, const Address *src) {
Link *link;
bool ready;
int r;
@ -443,17 +444,18 @@ static int address_update(Address *address, const Address *src) {
assert(address->link);
assert(src);
link = address->link;
ready = address_is_ready(address);
address->flags = src->flags;
address->scope = src->scope;
address->cinfo = src->cinfo;
if (IN_SET(address->link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
return 0;
link_update_operstate(address->link, true);
link_check_ready(address->link);
link_update_operstate(link, true);
link_check_ready(link);
if (!ready && address_is_ready(address)) {
if (address->callback) {
@ -463,10 +465,10 @@ static int address_update(Address *address, const Address *src) {
}
if (address->family == AF_INET6 &&
in6_addr_is_link_local(&address->in_addr.in6) > 0 &&
in6_addr_is_null(&address->link->ipv6ll_address)) {
in6_addr_is_link_local(&address->in_addr.in6) &&
in6_addr_is_null(&link->ipv6ll_address)) {
r = link_ipv6ll_gained(address->link, &address->in_addr.in6);
r = link_ipv6ll_gained(link, &address->in_addr.in6);
if (r < 0)
return r;
}