netfilter: conntrack: Use flags in nf_ct_tmpl_alloc()
The flags were ignored for this function when it was introduced. Also
fix the style problem in kzalloc.
Fixes: 0838aa7fc
(netfilter: fix netns dependencies with conntrack
templates)
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
parent
1a727c6361
commit
f58e5aa7b8
|
@ -292,7 +292,7 @@ struct nf_conn *nf_ct_tmpl_alloc(struct net *net, u16 zone, gfp_t flags)
|
||||||
{
|
{
|
||||||
struct nf_conn *tmpl;
|
struct nf_conn *tmpl;
|
||||||
|
|
||||||
tmpl = kzalloc(sizeof(struct nf_conn), GFP_KERNEL);
|
tmpl = kzalloc(sizeof(*tmpl), flags);
|
||||||
if (tmpl == NULL)
|
if (tmpl == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
@ -303,7 +303,7 @@ struct nf_conn *nf_ct_tmpl_alloc(struct net *net, u16 zone, gfp_t flags)
|
||||||
if (zone) {
|
if (zone) {
|
||||||
struct nf_conntrack_zone *nf_ct_zone;
|
struct nf_conntrack_zone *nf_ct_zone;
|
||||||
|
|
||||||
nf_ct_zone = nf_ct_ext_add(tmpl, NF_CT_EXT_ZONE, GFP_ATOMIC);
|
nf_ct_zone = nf_ct_ext_add(tmpl, NF_CT_EXT_ZONE, flags);
|
||||||
if (!nf_ct_zone)
|
if (!nf_ct_zone)
|
||||||
goto out_free;
|
goto out_free;
|
||||||
nf_ct_zone->id = zone;
|
nf_ct_zone->id = zone;
|
||||||
|
|
Loading…
Reference in a new issue