Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / net / sched / act_ct.c

diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c
index e013253..d55afb8 100644 (file)
--- a/net/sched/act_ct.c
+++ b/net/sched/act_ct.c
@@ -277,7 +277,7 @@ static struct nf_flowtable_type flowtable_ct = {
        .owner          = THIS_MODULE,
 };
 
-static int tcf_ct_flow_table_get(struct tcf_ct_params *params)
+static int tcf_ct_flow_table_get(struct net *net, struct tcf_ct_params *params)
 {
        struct tcf_ct_flow_table *ct_ft;
        int err = -ENOMEM;
@@ -303,6 +303,7 @@ static int tcf_ct_flow_table_get(struct tcf_ct_params *params)
        err = nf_flow_table_init(&ct_ft->nf_ft);
        if (err)
                goto err_init;
+       write_pnet(&ct_ft->nf_ft.net, net);
 
        __module_get(THIS_MODULE);
 out_unlock:
@@ -1391,7 +1392,7 @@ static int tcf_ct_init(struct net *net, struct nlattr *nla,
        if (err)
                goto cleanup;
 
-       err = tcf_ct_flow_table_get(params);
+       err = tcf_ct_flow_table_get(net, params);
        if (err)
                goto cleanup;