netlink: fix for too early rmmod

[safe/jmp/linux-2.6] / net / ipv6 / fib6_rules.c

diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index f5de3f9..b7aa7c6 100644 (file)
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -151,7 +151,7 @@ static const struct nla_policy fib6_rule_policy[FRA_MAX+1] = {
 };
 
 static int fib6_rule_configure(struct fib_rule *rule, struct sk_buff *skb,
-                              struct nlmsghdr *nlh, struct fib_rule_hdr *frh,
+                              struct fib_rule_hdr *frh,
                               struct nlattr **tb)
 {
        int err = -EINVAL;
@@ -211,7 +211,7 @@ static int fib6_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh,
 }
 
 static int fib6_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
-                         struct nlmsghdr *nlh, struct fib_rule_hdr *frh)
+                         struct fib_rule_hdr *frh)
 {
        struct fib6_rule *rule6 = (struct fib6_rule *) rule;
 
@@ -264,44 +264,36 @@ static struct fib_rules_ops fib6_rules_ops_template = {
 
 static int fib6_rules_net_init(struct net *net)
 {
+       struct fib_rules_ops *ops;
        int err = -ENOMEM;
 
-       net->ipv6.fib6_rules_ops = kmemdup(&fib6_rules_ops_template,
-                                          sizeof(*net->ipv6.fib6_rules_ops),
-                                          GFP_KERNEL);
-       if (!net->ipv6.fib6_rules_ops)
-               goto out;
+       ops = fib_rules_register(&fib6_rules_ops_template, net);
+       if (IS_ERR(ops))
+               return PTR_ERR(ops);
+       net->ipv6.fib6_rules_ops = ops;
 
-       net->ipv6.fib6_rules_ops->fro_net = net;
-       INIT_LIST_HEAD(&net->ipv6.fib6_rules_ops->rules_list);
 
        err = fib_default_rule_add(net->ipv6.fib6_rules_ops, 0,
-                                  RT6_TABLE_LOCAL, FIB_RULE_PERMANENT);
+                                  RT6_TABLE_LOCAL, 0);
        if (err)
                goto out_fib6_rules_ops;
 
        err = fib_default_rule_add(net->ipv6.fib6_rules_ops,
                                   0x7FFE, RT6_TABLE_MAIN, 0);
        if (err)
-               goto out_fib6_default_rule_add;
+               goto out_fib6_rules_ops;
 
-       err = fib_rules_register(net->ipv6.fib6_rules_ops);
-       if (err)
-               goto out_fib6_default_rule_add;
 out:
        return err;
 
-out_fib6_default_rule_add:
-       fib_rules_cleanup_ops(net->ipv6.fib6_rules_ops);
 out_fib6_rules_ops:
-       kfree(net->ipv6.fib6_rules_ops);
+       fib_rules_unregister(ops);
        goto out;
 }
 
 static void fib6_rules_net_exit(struct net *net)
 {
        fib_rules_unregister(net->ipv6.fib6_rules_ops);
-       kfree(net->ipv6.fib6_rules_ops);
 }
 
 static struct pernet_operations fib6_rules_net_ops = {