netfilter: conntrack: Remove redundant NFCT_ALIGN call

The "nf_ct_tmpl_alloc" function had a redundant call to "NFCT_ALIGN" when
aligning the pointer "p". Since "NFCT_ALIGN" always gives the same result
for the same input.

Signed-off-by: Xuanqiang Luo <luoxuanqiang@kylinos.cn>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 7f8b245e287aebf305e7e797ab70ac207ebaa012..de8d50af9b5b582213fa369e2f6dd240410654b4 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -531,10 +531,8 @@ struct nf_conn *nf_ct_tmpl_alloc(struct net *net,
 
                p = tmpl;
                tmpl = (struct nf_conn *)NFCT_ALIGN((unsigned long)p);
-               if (tmpl != p) {
-                       tmpl = (struct nf_conn *)NFCT_ALIGN((unsigned long)p);
+               if (tmpl != p)
                        tmpl->proto.tmpl_padto = (char *)tmpl - (char *)p;
-               }
        } else {
                tmpl = kzalloc(sizeof(*tmpl), flags);
                if (!tmpl)