* [PATCH nf-next 2/2] netfilter: nf_tables: Make sure the uniform style of condition blocks in nf_tables_newrule
@ 2016-12-29 3:39 fgao
2017-01-05 12:34 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: fgao @ 2016-12-29 3:39 UTC (permalink / raw)
To: pablo, netfilter-devel; +Cc: gfree.wind, Gao Feng
From: Gao Feng <fgao@ikuai8.com>
There is one different brace style of condtion blocks in
nf_tables_newrule. Now just make it uniform.
Signed-off-by: Gao Feng <fgao@ikuai8.com>
---
net/netfilter/nf_tables_api.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index ecc516c..7ac2b2e 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2261,12 +2261,12 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk,
err = -ENOENT;
goto err2;
}
- } else if (nlh->nlmsg_flags & NLM_F_APPEND)
+ } else if (nlh->nlmsg_flags & NLM_F_APPEND) {
if (old_rule)
list_add_rcu(&rule->list, &old_rule->list);
else
list_add_tail_rcu(&rule->list, &chain->rules);
- else {
+ } else {
if (old_rule)
list_add_tail_rcu(&rule->list, &old_rule->list);
else
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH nf-next 2/2] netfilter: nf_tables: Make sure the uniform style of condition blocks in nf_tables_newrule
2016-12-29 3:39 [PATCH nf-next 2/2] netfilter: nf_tables: Make sure the uniform style of condition blocks in nf_tables_newrule fgao
@ 2017-01-05 12:34 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2017-01-05 12:34 UTC (permalink / raw)
To: fgao; +Cc: netfilter-devel, gfree.wind
On Thu, Dec 29, 2016 at 11:39:58AM +0800, fgao@ikuai8.com wrote:
> From: Gao Feng <fgao@ikuai8.com>
>
> There is one different brace style of condtion blocks in
> nf_tables_newrule. Now just make it uniform.
>
> Signed-off-by: Gao Feng <fgao@ikuai8.com>
> ---
> net/netfilter/nf_tables_api.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
> index ecc516c..7ac2b2e 100644
> --- a/net/netfilter/nf_tables_api.c
> +++ b/net/netfilter/nf_tables_api.c
> @@ -2261,12 +2261,12 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk,
> err = -ENOENT;
> goto err2;
> }
> - } else if (nlh->nlmsg_flags & NLM_F_APPEND)
> + } else if (nlh->nlmsg_flags & NLM_F_APPEND) {
> if (old_rule)
> list_add_rcu(&rule->list, &old_rule->list);
> else
> list_add_tail_rcu(&rule->list, &chain->rules);
> - else {
> + } else {
Thanks for the cleanup. But I have patch revisiting this logic still
cooking, so I'll add these braces there so we can skip this cleanup patch.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-05 12:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-29 3:39 [PATCH nf-next 2/2] netfilter: nf_tables: Make sure the uniform style of condition blocks in nf_tables_newrule fgao
2017-01-05 12:34 ` Pablo Neira Ayuso
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).