From: David Ahern Date: Wed, 18 Apr 2018 22:39:04 +0000 (-0700) Subject: net/ipv6: Remove compare of fib6_idev from rt6_duplicate_nexthop X-Git-Tag: Ubuntu-5.13.0-19.19~10867^2~432^2~2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=647d4c1363a85bec63ecf929d4ab4aae78b2a960;p=mirror_ubuntu-jammy-kernel.git net/ipv6: Remove compare of fib6_idev from rt6_duplicate_nexthop After 4832c30d5458 ("net: ipv6: put host and anycast routes on device with address") the comparison of idev does not add value since it correlates to the nexthop device which is already compared. Remove the idev comparison. Signed-off-by: David Ahern Signed-off-by: David S. Miller --- diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index c0620330035c..8df4ff798b04 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -275,7 +275,6 @@ static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt, static inline bool rt6_duplicate_nexthop(struct fib6_info *a, struct fib6_info *b) { return a->fib6_nh.nh_dev == b->fib6_nh.nh_dev && - a->fib6_idev == b->fib6_idev && ipv6_addr_equal(&a->fib6_nh.nh_gw, &b->fib6_nh.nh_gw) && !lwtunnel_cmp_encap(a->fib6_nh.nh_lwtstate, b->fib6_nh.nh_lwtstate); }