Skip to content

Commit

Permalink
ipv6: Restore RTF_ADDRCONF check in rt6_qualify_for_ecmp
Browse files Browse the repository at this point in the history
The RTF_ADDRCONF flag filters out routes added by RA's in determining
which routes can be appended to an existing one to create a multipath
route. Restore the flag check and add a comment to document the RA piece.

Fixes: 4e54507 ("ipv6: Simplify rt6_qualify_for_ecmp")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David Ahern authored and David S. Miller committed Apr 22, 2019
1 parent 4e54507 commit be659b8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
Original file line number Diff line number Diff line change
Expand Up @@ -4928,7 +4928,7 @@ static void mlxsw_sp_rt6_destroy(struct mlxsw_sp_rt6 *mlxsw_sp_rt6)
static bool mlxsw_sp_fib6_rt_can_mp(const struct fib6_info *rt)
{
/* RTF_CACHE routes are ignored */
return rt->fib6_nh.fib_nh_gw_family;
return !(rt->fib6_flags & RTF_ADDRCONF) && rt->fib6_nh.fib_nh_gw_family;
}

static struct fib6_info *
Expand Down
4 changes: 3 additions & 1 deletion include/net/ip6_route.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ static inline bool rt6_need_strict(const struct in6_addr *daddr)

static inline bool rt6_qualify_for_ecmp(const struct fib6_info *f6i)
{
return f6i->fib6_nh.fib_nh_gw_family;
/* the RTF_ADDRCONF flag filters out RA's */
return !(f6i->fib6_flags & RTF_ADDRCONF) &&
f6i->fib6_nh.fib_nh_gw_family;
}

void ip6_route_input(struct sk_buff *skb);
Expand Down

0 comments on commit be659b8

Please sign in to comment.