From: Colin Ian King <colin.king at 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 at 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
walter harms
2017-Aug-15 07:26 UTC
[Bridge] [PATCH] netfilter: fix indent on in statements
Am 15.08.2017 08:50, schrieb Colin King:> From: Colin Ian King <colin.king at 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 at 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,
Sergei Shtylyov
2017-Aug-15 09:45 UTC
[Bridge] [PATCH] netfilter: fix indent on in statements
Hello! On 8/15/2017 9:50 AM, Colin King wrote:> From: Colin Ian King <colin.king at 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 at canonical.com>[...] MBR, Sergei