Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753399AbdHOH05 (ORCPT ); Tue, 15 Aug 2017 03:26:57 -0400 Received: from mx02-sz.bfs.de ([194.94.69.103]:20430 "EHLO mx02-sz.bfs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753185AbdHOH0z (ORCPT ); Tue, 15 Aug 2017 03:26:55 -0400 Message-ID: <5992A239.5080600@bfs.de> Date: Tue, 15 Aug 2017 09:26:49 +0200 From: walter harms Reply-To: wharms@bfs.de User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; de; rv:1.9.1.16) Gecko/20101125 SUSE/3.0.11 Thunderbird/3.0.11 MIME-Version: 1.0 To: Colin King CC: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , Stephen Hemminger , "David S . Miller" , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, bridge@lists.linux-foundation.org, netdev@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] netfilter: fix indent on in statements References: <20170815065025.18471-1-colin.king@canonical.com> In-Reply-To: <20170815065025.18471-1-colin.king@canonical.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1882 Lines: 62 Am 15.08.2017 08:50, schrieb Colin King: > From: Colin Ian King > > The returns on some if statements are not indented correctly, > add in the missing tab. > > Signed-off-by: Colin Ian King > --- > net/bridge/netfilter/ebt_ip.c | 4 ++-- > net/bridge/netfilter/ebt_ip6.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c > index d06968bdf5ec..2b46c50abce0 100644 > --- a/net/bridge/netfilter/ebt_ip.c > +++ b/net/bridge/netfilter/ebt_ip.c > @@ -64,14 +64,14 @@ ebt_ip_mt(const struct sk_buff *skb, struct xt_action_param *par) > if (NF_INVF(info, EBT_IP_DPORT, > dst < info->dport[0] || > dst > info->dport[1])) > - return false; > + return false; This is hard to read, perhaps it gets better when the result is stored in a tmp-var. something like: int isbetween=dst < info->dport[0] ||dst > info->dport[1] ; int state=NF_INVF(info, EBT_IP_DPORT, isbetween ); if ( state ) return false; just my 2 cents, re, wh > } > if (info->bitmask & EBT_IP_SPORT) { > u32 src = ntohs(pptr->src); > if (NF_INVF(info, EBT_IP_SPORT, > src < info->sport[0] || > src > info->sport[1])) > - return false; > + return false; > } > } > return true; > diff --git a/net/bridge/netfilter/ebt_ip6.c b/net/bridge/netfilter/ebt_ip6.c > index 4617491be41e..2a5a52a53ec4 100644 > --- a/net/bridge/netfilter/ebt_ip6.c > +++ b/net/bridge/netfilter/ebt_ip6.c > @@ -89,7 +89,7 @@ ebt_ip6_mt(const struct sk_buff *skb, struct xt_action_param *par) > if (NF_INVF(info, EBT_IP6_SPORT, > src < info->sport[0] || > src > info->sport[1])) > - return false; > + return false; > } > if ((info->bitmask & EBT_IP6_ICMP6) && > NF_INVF(info, EBT_IP6_ICMP6,