diff options
| author |   David Ahern <dsahern@gmail.com> | 2019-04-09 14:41:17 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-04-11 14:24:06 -0700 |
| commit | d83009d462a68ad908a51e1690d46917cbad0440 (patch) | |
| tree | f2c01c9d5b26569b9a33945905ed7b94fa4bde28 /net/ipv6/route.c | |
| parent | ipv6: Be smarter with null_entry handling in ip6_pol_route_lookup (diff) | |
| download | linux-dev-d83009d462a68ad908a51e1690d46917cbad0440.tar.xz linux-dev-d83009d462a68ad908a51e1690d46917cbad0440.zip | |
ipv6: Move fib6_multipath_select down in ip6_pol_route
Move the siblings and fib6_multipath_select after the null entry check
since a null entry can not have siblings.
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 0745ed872e5b..4acb71f0bc55 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1843,9 +1843,6 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, rcu_read_lock(); f6i = fib6_table_lookup(net, table, oif, fl6, strict); - if (f6i->fib6_nsiblings) - f6i = fib6_multipath_select(net, f6i, fl6, oif, skb, strict); - if (f6i == net->ipv6.fib6_null_entry) { rt = net->ipv6.ip6_null_entry; rcu_read_unlock(); @@ -1853,6 +1850,9 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, return rt; } + if (f6i->fib6_nsiblings) + f6i = fib6_multipath_select(net, f6i, fl6, oif, skb, strict); + /*Search through exception table */ rt = rt6_find_cached_rt(f6i, &fl6->daddr, &fl6->saddr); if (rt) { |