From patchwork Wed Dec 28 13:39:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 133434 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 74068B6F6F for ; Thu, 29 Dec 2011 00:40:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753911Ab1L1Nj5 (ORCPT ); Wed, 28 Dec 2011 08:39:57 -0500 Received: from mail.us.es ([193.147.175.20]:59529 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753789Ab1L1Nju (ORCPT ); Wed, 28 Dec 2011 08:39:50 -0500 Received: (qmail 6885 invoked from network); 28 Dec 2011 14:39:48 +0100 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 28 Dec 2011 14:39:48 +0100 Received: (qmail 22208 invoked by uid 507); 28 Dec 2011 13:39:49 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-97.1 required=7.5 tests=BAYES_50,KHOP_DYNAMIC, RCVD_IN_PBL,RCVD_IN_SORBS_DUL,RDNS_DYNAMIC,USER_IN_WHITELIST autolearn=disabled version=3.3.1 Received: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.08 (clamdscan: 0.97.3/14201. Clear:RC:1(127.0.0.1):. Processed in 0.022475 secs); 28 Dec 2011 13:39:49 -0000 Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 28 Dec 2011 13:39:49 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/406/antivirus2); Wed, 28 Dec 2011 14:39:48 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/406/antivirus2) Received: (qmail 12718 invoked from network); 28 Dec 2011 14:39:47 +0100 Received: from 166.220.222.87.dynamic.jazztel.es (HELO localhost.localdomain) (pneira@us.es@87.222.220.166) by us.es with SMTP; 28 Dec 2011 14:39:47 +0100 From: pablo@netfilter.org To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org, jengelh@medozas.de, kaber@trash.net Subject: [PATCH 4/5] netfilter: xtables: collapse conditions in xt_ecn Date: Wed, 28 Dec 2011 14:39:32 +0100 Message-Id: <1325079573-6120-5-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1325079573-6120-1-git-send-email-pablo@netfilter.org> References: <1325079573-6120-1-git-send-email-pablo@netfilter.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jan Engelhardt One simplification of an if clause. Signed-off-by: Jan Engelhardt Signed-off-by: Pablo Neira Ayuso --- net/netfilter/xt_ecn.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/net/netfilter/xt_ecn.c b/net/netfilter/xt_ecn.c index 6ccc35d..3c831a8 100644 --- a/net/netfilter/xt_ecn.c +++ b/net/netfilter/xt_ecn.c @@ -37,9 +37,8 @@ static bool match_tcp(const struct sk_buff *skb, struct xt_action_param *par) * be good citizens. */ th = skb_header_pointer(skb, par->thoff, sizeof(_tcph), &_tcph); - if (th == NULL) { + if (th == NULL) return false; - } if (einfo->operation & XT_ECN_OP_MATCH_ECE) { if (einfo->invert & XT_ECN_OP_MATCH_ECE) { @@ -75,14 +74,12 @@ static bool ecn_mt4(const struct sk_buff *skb, struct xt_action_param *par) { const struct xt_ecn_info *info = par->matchinfo; - if (info->operation & XT_ECN_OP_MATCH_IP) - if (!match_ip(skb, info)) - return false; + if (info->operation & XT_ECN_OP_MATCH_IP && !match_ip(skb, info)) + return false; - if (info->operation & (XT_ECN_OP_MATCH_ECE | XT_ECN_OP_MATCH_CWR)) { - if (!match_tcp(skb, par)) - return false; - } + if (info->operation & (XT_ECN_OP_MATCH_ECE | XT_ECN_OP_MATCH_CWR) && + !match_tcp(skb, par)) + return false; return true; }