From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Subject: [rfc 1/2] [PATCH 1/2] Slightly simplify options conflicts logic Date: Thu, 05 Aug 2010 20:47:56 +0900 Message-ID: <20100805115605.211216460@vergenet.net> References: <20100805115505.582164394@vergenet.net> Cc: Wensong Zhang , Julian Anastasov , Patrick McHardy To: lvs-devel@vger.kernel.org, netdev@vger.kernel.org, netfilter@vger.kernel.org, netfilter-devel@vger.kernel.org Return-path: Received: from kirsty.vergenet.net ([202.4.237.240]:34381 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755476Ab0HEMMR (ORCPT ); Thu, 5 Aug 2010 08:12:17 -0400 Content-Disposition: inline; filename=0001-Slightly-simplify-options-conflicts-logic.patch Sender: netdev-owner@vger.kernel.org List-ID: Signed-off-by: Simon Horman --- ipvsadm.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ipvsadm.c b/ipvsadm.c index 76ec7c4..1ac6c7f 100644 --- a/ipvsadm.c +++ b/ipvsadm.c @@ -763,11 +763,9 @@ static int process_options(int argc, char **argv, int reading_stdin) switch (ce.cmd) { case CMD_LIST: - if ((options & OPT_CONNECTION || - options & OPT_TIMEOUT || options & OPT_DAEMON) && - (options & OPT_STATS || - options & OPT_PERSISTENTCONN || - options & OPT_RATE || options & OPT_THRESHOLDS)) + if (options & (OPT_CONNECTION|OPT_TIMEOUT|OPT_DAEMON) && + options & (OPT_STATS|OPT_PERSISTENTCONN| + OPT_RATE|OPT_THRESHOLDS)) fail(2, "options conflicts in the list command"); if (options & OPT_CONNECTION) -- 1.7.1