diff options
| author | David Ahern <dsahern@gmail.com> | 2019-04-21 17:39:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-21 19:44:16 -0700 |
| commit | be659b8d3c79afc54e087ebf8d849685d7b0d395 (patch) | |
| tree | 4f37305bd15a27306c0a9dddcb628f66fdc70df1 /include/net/ip6_route.h | |
| parent | 4e54507ab1a9da05238b986292f6cb702e6696c7 (diff) | |
| download | lwn-be659b8d3c79afc54e087ebf8d849685d7b0d395.tar.gz lwn-be659b8d3c79afc54e087ebf8d849685d7b0d395.zip | |
ipv6: Restore RTF_ADDRCONF check in rt6_qualify_for_ecmp
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: 4e54507ab1a9 ("ipv6: Simplify rt6_qualify_for_ecmp")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip6_route.h')
| -rw-r--r-- | include/net/ip6_route.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 518d97fbe074..df9cebc2b20c 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -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); |