[NETNS][IPV6] ip6_fib - make it per network namespace

[~andy/linux] / net / ipv6 / fib6_rules.c

diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index e4d7e5a08b4060a06dd70e815aff20fac95f45d2..03ad23a5fd3cadd9ea16a9f7d60e298f7b399906 100644 (file)
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -31,8 +31,8 @@ struct fib6_rule
 
 static struct fib_rules_ops fib6_rules_ops;
 
-struct dst_entry *fib6_rule_lookup(struct flowi *fl, int flags,
-                                  pol_lookup_t lookup)
+struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi *fl,
+                                  int flags, pol_lookup_t lookup)
 {
        struct fib_lookup_arg arg = {
                .lookup_ptr = lookup,
@@ -71,7 +71,7 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp,
                goto discard_pkt;
        }
 
-       table = fib6_get_table(rule->table);
+       table = fib6_get_table(&init_net, rule->table);
        if (table)
                rt = lookup(table, flp, flags);
 
@@ -85,8 +85,8 @@ 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;
-                       if (ipv6_get_saddr(&rt->u.dst, &flp->fl6_dst,
-                                          &saddr))
+                       if (ipv6_dev_get_saddr(ip6_dst_idev(&rt->u.dst)->dev,
+                                              &flp->fl6_dst, &saddr))
                                goto again;
                        if (!ipv6_prefix_equal(&saddr, &r->src.addr,
                                               r->src.plen))
@@ -151,7 +151,7 @@ static int fib6_rule_configure(struct fib_rule *rule, struct sk_buff *skb,
                if (rule->table == RT6_TABLE_UNSPEC)
                        goto errout;
 
-               if (fib6_new_table(rule->table) == NULL) {
+               if (fib6_new_table(&init_net, rule->table) == NULL) {
                        err = -ENOBUFS;
                        goto errout;
                }
@@ -223,7 +223,7 @@ nla_put_failure:
        return -ENOBUFS;
 }
 
-static u32 fib6_rule_default_pref(void)
+static u32 fib6_rule_default_pref(struct fib_rules_ops *ops)
 {
        return 0x3FFF;
 }
@@ -249,6 +249,7 @@ static struct fib_rules_ops fib6_rules_ops = {
        .policy                 = fib6_rule_policy,
        .rules_list             = LIST_HEAD_INIT(fib6_rules_ops.rules_list),
        .owner                  = THIS_MODULE,
+       .fro_net                = &init_net,
 };
 
 static int __init fib6_default_rules_init(void)
@@ -273,7 +274,7 @@ int __init fib6_rules_init(void)
        if (ret)
                goto out;
 
-       ret = fib_rules_register(&init_net, &fib6_rules_ops);
+       ret = fib_rules_register(&fib6_rules_ops);
        if (ret)
                goto out_default_rules_init;
 out:
@@ -286,5 +287,5 @@ out_default_rules_init:
 
 void fib6_rules_cleanup(void)
 {
-       fib_rules_unregister(&init_net, &fib6_rules_ops);
+       fib_rules_unregister(&fib6_rules_ops);
 }