diff options
| author | David Ahern <dsahern@gmail.com> | 2018-07-03 14:36:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-04 15:22:13 +0900 |
| commit | 33bd5ac54dc47e002da4a395aaf9bf158dd17709 (patch) | |
| tree | ab1ae4d9b646d58328fffb8f33b0acc3ab33da0e /include/net | |
| parent | d5a672ac9f48f81b20b1cad1d9ed7bbf4e418d4c (diff) | |
| download | linux-33bd5ac54dc47e002da4a395aaf9bf158dd17709.tar.bz2 | |
net/ipv6: Revert attempt to simplify route replace and append
NetworkManager likes to manage linklocal prefix routes and does so with
the NLM_F_APPEND flag, breaking attempts to simplify the IPv6 route
code and by extension enable multipath routes with device only nexthops.
Revert f34436a43092 and these followup patches:
6eba08c3626b ("ipv6: Only emit append events for appended routes").
ce45bded6435 ("mlxsw: spectrum_router: Align with new route replace logic")
53b562df8c20 ("mlxsw: spectrum_router: Allow appending to dev-only routes")
Update the fib_tests cases to reflect the old behavior.
Fixes: f34436a43092 ("net/ipv6: Simplify route replace and appending into multipath route")
Signed-off-by: David Ahern <dsahern@gmail.com>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip6_route.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 59656fc580df..7b9c82de11cc 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -66,6 +66,12 @@ static inline bool rt6_need_strict(const struct in6_addr *daddr) (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL | IPV6_ADDR_LOOPBACK); } +static inline bool rt6_qualify_for_ecmp(const struct fib6_info *f6i) +{ + return (f6i->fib6_flags & (RTF_GATEWAY|RTF_ADDRCONF|RTF_DYNAMIC)) == + RTF_GATEWAY; +} + void ip6_route_input(struct sk_buff *skb); struct dst_entry *ip6_route_input_lookup(struct net *net, struct net_device *dev, |