Merge branch 'async-tx-for-linus' of git://lost.foo-projects.org/~dwillia2/git/iop...

[linux-2.6] / net / decnet / dn_rules.c

diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index 0b5e2b97e15a1257fa0e27344564b3f62555851a..5b7539b7fe0c81af38cf66046defc40a83145f94 100644 (file)
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -212,7 +212,7 @@ nla_put_failure:
        return -ENOBUFS;
 }
 
-static u32 dn_fib_rule_default_pref(void)
+static u32 dn_fib_rule_default_pref(struct fib_rules_ops *ops)
 {
        struct list_head *pos;
        struct fib_rule *rule;
@@ -249,18 +249,19 @@ static struct fib_rules_ops dn_fib_rules_ops = {
        .policy         = dn_fib_rule_policy,
        .rules_list     = LIST_HEAD_INIT(dn_fib_rules_ops.rules_list),
        .owner          = THIS_MODULE,
+       .fro_net        = &init_net,
 };
 
 void __init dn_fib_rules_init(void)
 {
        BUG_ON(fib_default_rule_add(&dn_fib_rules_ops, 0x7fff,
                                    RT_TABLE_MAIN, 0));
-       fib_rules_register(&init_net, &dn_fib_rules_ops);
+       fib_rules_register(&dn_fib_rules_ops);
 }
 
 void __exit dn_fib_rules_cleanup(void)
 {
-       fib_rules_unregister(&init_net, &dn_fib_rules_ops);
+       fib_rules_unregister(&dn_fib_rules_ops);
 }