]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net/ipv6: Remove compare of fib6_idev from rt6_duplicate_nexthop
authorDavid Ahern <dsahern@gmail.com>
Wed, 18 Apr 2018 22:39:04 +0000 (15:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 19 Apr 2018 19:40:13 +0000 (15:40 -0400)
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 <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/ip6_route.h

index c0620330035cd02d24e6d5b258878e8b9efb5d26..8df4ff798b040dbef0e1b2959f7131ae4be3398c 100644 (file)
@@ -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);
 }