From 87d8a4dee8a5fccb046d315341cd89d09bc1075e Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 26 Feb 2019 14:36:07 +0900 Subject: [PATCH] network: merge conditions and use FLAGS_SET() macro --- src/network/networkd-ndisc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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; } -- 2.47.3