Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1711910 > unrolled thread
| Started by | Colin King <colin.king@canonical.com> |
|---|---|
| First post | 2017-08-15 09:00 +0200 |
| Last post | 2017-08-15 12:00 +0200 |
| Articles | 4 — 4 participants |
Back to article view | Back to linux.kernel
[PATCH] netfilter: fix indent on in statements Colin King <colin.king@canonical.com> - 2017-08-15 09:00 +0200
Re: [PATCH] netfilter: fix indent on in statements walter harms <wharms@bfs.de> - 2017-08-15 09:30 +0200
Re: [PATCH] netfilter: fix indent on in statements Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2017-08-15 11:50 +0200
Re: [PATCH] netfilter: fix indent on in statements Colin Ian King <colin.king@canonical.com> - 2017-08-15 12:00 +0200
| From | Colin King <colin.king@canonical.com> |
|---|---|
| Date | 2017-08-15 09:00 +0200 |
| Subject | [PATCH] netfilter: fix indent on in statements |
| Message-ID | <ueDZw-6mv-7@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | walter harms <wharms@bfs.de> |
|---|---|
| Date | 2017-08-15 09:30 +0200 |
| Message-ID | <ueEsy-6Lw-9@gated-at.bofh.it> |
| In reply to | #1711910 |
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,
[toc] | [prev] | [next] | [standalone]
| From | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
|---|---|
| Date | 2017-08-15 11:50 +0200 |
| Message-ID | <ueGE2-83H-5@gated-at.bofh.it> |
| In reply to | #1711910 |
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
[toc] | [prev] | [next] | [standalone]
| From | Colin Ian King <colin.king@canonical.com> |
|---|---|
| Date | 2017-08-15 12:00 +0200 |
| Message-ID | <ueGNI-870-3@gated-at.bofh.it> |
| In reply to | #1712016 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web