Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 12 insertions, 27 deletions

diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index 00a7a5e4ac97..5e463c43fcc2 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -84,18 +84,11 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp,
                 if ((rule->flags & FIB_RULE_FIND_SADDR) &&
                     r->src.plen && !(flags & RT6_LOOKUP_F_HAS_SADDR)) {
                         struct in6_addr saddr;
-                        unsigned int srcprefs = 0;
-
-                        if (flags & RT6_LOOKUP_F_SRCPREF_TMP)
-                                srcprefs |= IPV6_PREFER_SRC_TMP;
-                        if (flags & RT6_LOOKUP_F_SRCPREF_PUBLIC)
-                                srcprefs |= IPV6_PREFER_SRC_PUBLIC;
-                        if (flags & RT6_LOOKUP_F_SRCPREF_COA)
-                                srcprefs |= IPV6_PREFER_SRC_COA;
 
                         if (ipv6_dev_get_saddr(net,
                                                ip6_dst_idev(&rt->u.dst)->dev,
-                                               &flp->fl6_dst, srcprefs,
+                                               &flp->fl6_dst,
+                                               rt6_flags2srcprefs(flags),
                                                &saddr))
                                 goto again;
                         if (!ipv6_prefix_equal(&saddr, &r->src.addr,
@@ -262,46 +255,38 @@ static struct fib_rules_ops fib6_rules_ops_template = {
         .fro_net                = &init_net,
 };
 
-static int fib6_rules_net_init(struct net *net)
+static int __net_init 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)
+static void __net_exit 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 = {