net/ipv6: Rename rt6_multipath_select

Rename rt6_multipath_select to fib6_multipath_select and export it.
A later patch wants access to it similar to IPv4's fib_select_path.

Signed-off-by: David Ahern <dsahern@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 43ab545e64eaaba7519e87aae2779851daca0c79..2597d8fdd92f80c5c7eea26eef30123a81b2364e 100644 (file)
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -376,6 +376,11 @@ struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi6 *fl6,
                                   const struct sk_buff *skb,
                                   int flags, pol_lookup_t lookup);
 
+struct fib6_info *fib6_multipath_select(const struct net *net,
+                                       struct fib6_info *match,
+                                       struct flowi6 *fl6, int oif,
+                                       const struct sk_buff *skb, int strict);
+
 struct fib6_node *fib6_node_lookup(struct fib6_node *root,
                                   const struct in6_addr *daddr,
                                   const struct in6_addr *saddr);

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 443d2a0bc15023b747f8e44ece6aeb3136d97c0d..6a10608d9025850005c0933bdb4b2efb868f42dd 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -419,11 +419,11 @@ static bool rt6_check_expired(const struct rt6_info *rt)
        return false;
 }
 
-static struct fib6_info *rt6_multipath_select(const struct net *net,
-                                             struct fib6_info *match,
-                                            struct flowi6 *fl6, int oif,
-                                            const struct sk_buff *skb,
-                                            int strict)
+struct fib6_info *fib6_multipath_select(const struct net *net,
+                                       struct fib6_info *match,
+                                       struct flowi6 *fl6, int oif,
+                                       const struct sk_buff *skb,
+                                       int strict)
 {
        struct fib6_info *sibling, *next_sibling;
 
@@ -1068,8 +1068,9 @@ restart:
                f6i = rt6_device_match(net, f6i, &fl6->saddr,
                                      fl6->flowi6_oif, flags);
                if (f6i->fib6_nsiblings && fl6->flowi6_oif == 0)
-                       f6i = rt6_multipath_select(net, f6i, fl6,
-                                                  fl6->flowi6_oif, skb, flags);
+                       f6i = fib6_multipath_select(net, f6i, fl6,
+                                                   fl6->flowi6_oif, skb,
+                                                   flags);
        }
        if (f6i == net->ipv6.fib6_null_entry) {
                fn = fib6_backtrack(fn, &fl6->saddr);
@@ -1824,7 +1825,7 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,
 redo_rt6_select:
        f6i = rt6_select(net, fn, oif, strict);
        if (f6i->fib6_nsiblings)
-               f6i = rt6_multipath_select(net, f6i, fl6, oif, skb, strict);
+               f6i = fib6_multipath_select(net, f6i, fl6, oif, skb, strict);
        if (f6i == net->ipv6.fib6_null_entry) {
                fn = fib6_backtrack(fn, &fl6->saddr);
                if (fn)