From: Simon Horman <horms@verge.net.au>
To: lvs-devel@vger.kernel.org, netdev@vger.kernel.org,
netfilter@vger.kernel.org, netfilter-devel@vger.kernel.org
Cc: Wensong Zhang <wensong@linux-vs.org>,
Julian Anastasov <ja@ssi.bg>, Patrick McHardy <kaber@trash.net>
Subject: [rfc 1/2] [PATCH 1/2] Slightly simplify options conflicts logic
Date: Thu, 05 Aug 2010 20:47:56 +0900 [thread overview]
Message-ID: <20100805115605.211216460@vergenet.net> (raw)
In-Reply-To: 20100805115505.582164394@vergenet.net
[-- Attachment #1: 0001-Slightly-simplify-options-conflicts-logic.patch --]
[-- Type: text/plain, Size: 825 bytes --]
Signed-off-by: Simon Horman <horms@verge.net.au>
---
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
next prev parent reply other threads:[~2010-08-05 12:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-05 11:47 [rfc 0/2] ipvsadm: SIP Persistence Engine Simon Horman
2010-08-05 11:47 ` Simon Horman [this message]
2010-08-05 11:47 ` [rfc 2/2] [PATCH 2/2] Add support for persistence engines Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100805115605.211216460@vergenet.net \
--to=horms@verge.net.au \
--cc=ja@ssi.bg \
--cc=kaber@trash.net \
--cc=lvs-devel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=netfilter@vger.kernel.org \
--cc=wensong@linux-vs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox