From patchwork Fri Oct 1 14:40:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 66398 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4D03EB70AA for ; Sat, 2 Oct 2010 00:45:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757052Ab0JAOpw (ORCPT ); Fri, 1 Oct 2010 10:45:52 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:55341 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756992Ab0JAOpu (ORCPT ); Fri, 1 Oct 2010 10:45:50 -0400 Received: from ayumi.akashicho.tokyo.vergenet.net (219-109-213-121.bitcat.net [219.109.213.121]) by kirsty.vergenet.net (Postfix) with ESMTP id 27BD2245AA; Sat, 2 Oct 2010 00:45:49 +1000 (EST) Received: by ayumi.akashicho.tokyo.vergenet.net (Postfix, from userid 7100) id 70C78EDE0E7; Fri, 1 Oct 2010 23:45:46 +0900 (JST) Message-Id: <20101001144126.520973076@akiko.akashicho.tokyo.vergenet.net> User-Agent: quilt/0.48-1 Date: Fri, 01 Oct 2010 23:40:42 +0900 From: Simon Horman To: lvs-devel@vger.kernel.org, netdev@vger.kernel.org, netfilter@vger.kernel.org, netfilter-devel@vger.kernel.org Cc: Jan Engelhardt , Stephen Hemminger , Wensong Zhang , Julian Anastasov , Patrick McHardy Subject: [patch v2 1/2] [PATCH 1/2] Slightly simplify options conflicts logic References: <20101001144041.414393254@akiko.akashicho.tokyo.vergenet.net> Content-Disposition: inline; filename=0001-Slightly-simplify-options-conflicts-logic.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Simon Horman 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)