* [PATCH] netfilter: fix indent on in statements
@ 2017-08-15 6:50 Colin King
2017-08-15 7:26 ` walter harms
2017-08-15 9:45 ` Sergei Shtylyov
0 siblings, 2 replies; 4+ messages in thread
From: Colin King @ 2017-08-15 6:50 UTC (permalink / raw)
To: Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal,
Stephen Hemminger, David S . Miller, netfilter-devel, coreteam,
bridge, netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
The returns on some if statements are not indented correctly,
add in the missing tab.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
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;
}
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,
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] netfilter: fix indent on in statements
2017-08-15 6:50 [PATCH] netfilter: fix indent on in statements Colin King
@ 2017-08-15 7:26 ` walter harms
2017-08-15 9:45 ` Sergei Shtylyov
1 sibling, 0 replies; 4+ messages in thread
From: walter harms @ 2017-08-15 7:26 UTC (permalink / raw)
To: Colin King
Cc: Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal,
Stephen Hemminger, David S . Miller, netfilter-devel, coreteam,
bridge, netdev, kernel-janitors, linux-kernel
Am 15.08.2017 08:50, schrieb Colin King:
> From: Colin Ian King <colin.king@canonical.com>
>
> The returns on some if statements are not indented correctly,
> add in the missing tab.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> 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,
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] netfilter: fix indent on in statements
2017-08-15 6:50 [PATCH] netfilter: fix indent on in statements Colin King
2017-08-15 7:26 ` walter harms
@ 2017-08-15 9:45 ` Sergei Shtylyov
2017-08-15 9:51 ` Colin Ian King
1 sibling, 1 reply; 4+ messages in thread
From: Sergei Shtylyov @ 2017-08-15 9:45 UTC (permalink / raw)
To: Colin King, Pablo Neira Ayuso, Jozsef Kadlecsik, Florian Westphal,
Stephen Hemminger, David S . Miller, netfilter-devel, coreteam,
bridge, netdev
Cc: kernel-janitors, linux-kernel
Hello!
On 8/15/2017 9:50 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The returns on some if statements are not indented correctly,
s/in/if/ in the subject?
> add in the missing tab.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] netfilter: fix indent on in statements
2017-08-15 9:45 ` Sergei Shtylyov
@ 2017-08-15 9:51 ` Colin Ian King
0 siblings, 0 replies; 4+ messages in thread
From: Colin Ian King @ 2017-08-15 9:51 UTC (permalink / raw)
To: Sergei Shtylyov, Pablo Neira Ayuso, Jozsef Kadlecsik,
Florian Westphal, Stephen Hemminger, David S . Miller,
netfilter-devel, coreteam, bridge, netdev
Cc: kernel-janitors, linux-kernel
On 15/08/17 10:45, Sergei Shtylyov wrote:
> Hello!
>
> On 8/15/2017 9:50 AM, Colin King wrote:
>
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> The returns on some if statements are not indented correctly,
>
> s/in/if/ in the subject?
Doh, fix resent.
>
>> add in the missing tab.
>>
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> [...]
>
> MBR, Sergei
> --
> To unsubscribe from this list: send the line "unsubscribe
> kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-08-15 9:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-15 6:50 [PATCH] netfilter: fix indent on in statements Colin King
2017-08-15 7:26 ` walter harms
2017-08-15 9:45 ` Sergei Shtylyov
2017-08-15 9:51 ` Colin Ian King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).