* [PATCH net] netfilter: conntrack: Use flags in nf_ct_tmpl_alloc()
@ 2015-08-05 1:34 Joe Stringer
2015-08-05 1:38 ` Joe Stringer
2015-08-05 8:55 ` Pablo Neira Ayuso
0 siblings, 2 replies; 3+ messages in thread
From: Joe Stringer @ 2015-08-05 1:34 UTC (permalink / raw)
To: pablo; +Cc: linux-kernel, netfilter-devel
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>
---
net/netfilter/nf_conntrack_core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index f168099..3c20d02 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -292,7 +292,7 @@ struct nf_conn *nf_ct_tmpl_alloc(struct net *net, u16 zone, gfp_t flags)
{
struct nf_conn *tmpl;
- tmpl = kzalloc(sizeof(struct nf_conn), GFP_KERNEL);
+ tmpl = kzalloc(sizeof(*tmpl), flags);
if (tmpl == NULL)
return NULL;
@@ -303,7 +303,7 @@ struct nf_conn *nf_ct_tmpl_alloc(struct net *net, u16 zone, gfp_t flags)
if (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)
goto out_free;
nf_ct_zone->id = zone;
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] netfilter: conntrack: Use flags in nf_ct_tmpl_alloc()
2015-08-05 1:34 [PATCH net] netfilter: conntrack: Use flags in nf_ct_tmpl_alloc() Joe Stringer
@ 2015-08-05 1:38 ` Joe Stringer
2015-08-05 8:55 ` Pablo Neira Ayuso
1 sibling, 0 replies; 3+ messages in thread
From: Joe Stringer @ 2015-08-05 1:38 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Linux Kernel, netfilter-devel
On 4 August 2015 at 18:34, Joe Stringer <joestringer@nicira.com> wrote:
> 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>
s/net/nf/ in subject line.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] netfilter: conntrack: Use flags in nf_ct_tmpl_alloc()
2015-08-05 1:34 [PATCH net] netfilter: conntrack: Use flags in nf_ct_tmpl_alloc() Joe Stringer
2015-08-05 1:38 ` Joe Stringer
@ 2015-08-05 8:55 ` Pablo Neira Ayuso
1 sibling, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2015-08-05 8:55 UTC (permalink / raw)
To: Joe Stringer; +Cc: linux-kernel, netfilter-devel
On Tue, Aug 04, 2015 at 06:34:00PM -0700, Joe Stringer wrote:
> The flags were ignored for this function when it was introduced. Also
> fix the style problem in kzalloc.
Applied, thanks Joe.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-05 8:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-05 1:34 [PATCH net] netfilter: conntrack: Use flags in nf_ct_tmpl_alloc() Joe Stringer
2015-08-05 1:38 ` Joe Stringer
2015-08-05 8:55 ` 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).