Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index b7aa7c64cc4a2895001f7f256cf26675304d3f24..5e463c43fcc27a3abdfaf257a0bae134819154ae 100644 (file)
--- 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,7 +255,7 @@ 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;
@@ -291,7 +284,7 @@ out_fib6_rules_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);
 }