Skip to content
This repository has been archived by the owner on Sep 24, 2020. It is now read-only.

Commit

Permalink
ipv6: Allow non-gateway ECMP for IPv6
Browse files Browse the repository at this point in the history
It is valid to have static routes where the nexthop
is an interface not an address such as tunnels.
For IPv4 it was possible to use ECMP on these routes
but not for IPv6.

Signed-off-by: Thomas Winter <Thomas.Winter@alliedtelesis.co.nz>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Acked-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
thomasjwinter authored and davem330 committed May 1, 2018
1 parent d656fe4 commit edd7ceb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
3 changes: 1 addition & 2 deletions include/net/ip6_route.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ static inline bool rt6_need_strict(const struct in6_addr *daddr)

static inline bool rt6_qualify_for_ecmp(const struct rt6_info *rt)
{
return (rt->rt6i_flags & (RTF_GATEWAY|RTF_ADDRCONF|RTF_DYNAMIC)) ==
RTF_GATEWAY;
return (rt->rt6i_flags & (RTF_ADDRCONF | RTF_DYNAMIC)) == 0;
}

void ip6_route_input(struct sk_buff *skb);
Expand Down
3 changes: 0 additions & 3 deletions net/ipv6/ip6_fib.c
Original file line number Diff line number Diff line change
Expand Up @@ -934,9 +934,6 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt,
* list.
* Only static routes (which don't have flag
* RTF_EXPIRES) are used for ECMPv6.
*
* To avoid long list, we only had siblings if the
* route have a gateway.
*/
if (rt_can_ecmp &&
rt6_qualify_for_ecmp(iter))
Expand Down

0 comments on commit edd7ceb

Please sign in to comment.