From: Yu Watanabe Date: Tue, 26 Feb 2019 05:36:07 +0000 (+0900) Subject: network: merge conditions and use FLAGS_SET() macro X-Git-Tag: v242-rc1~238^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87d8a4dee8a5fccb046d315341cd89d09bc1075e;p=thirdparty%2Fsystemd.git network: merge conditions and use FLAGS_SET() macro --- diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index d99c0670e8b..eb470a4d481 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -521,13 +521,13 @@ static int ndisc_router_process_options(Link *link, sd_ndisc_router *rt) { if (r < 0) return log_link_warning_errno(link, r, "Failed to get RA prefix flags: %m"); - if (link->network->ipv6_accept_ra_use_onlink_prefix) - if (flags & ND_OPT_PI_FLAG_ONLINK) - (void) ndisc_router_process_onlink_prefix(link, rt); + if (link->network->ipv6_accept_ra_use_onlink_prefix && + FLAGS_SET(flags, ND_OPT_PI_FLAG_ONLINK)) + (void) ndisc_router_process_onlink_prefix(link, rt); - if (link->network->ipv6_accept_ra_use_autonomous_prefix) - if (flags & ND_OPT_PI_FLAG_AUTO) - (void) ndisc_router_process_autonomous_prefix(link, rt); + if (link->network->ipv6_accept_ra_use_autonomous_prefix && + FLAGS_SET(flags, ND_OPT_PI_FLAG_AUTO)) + (void) ndisc_router_process_autonomous_prefix(link, rt); break; }