diff options
| author | David Ahern <dsahern@gmail.com> | 2018-04-17 17:33:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-17 23:41:16 -0400 |
| commit | 5e670d844b2a4e47d1b9b9aceb14dd3c12a6d4bf (patch) | |
| tree | 2ad5e74ffea0c7bae6f318475cf37231658c19e5 /include/net/ip6_route.h | |
| parent | e8478e80e5a74f4ce47b043735f0066588fb64c7 (diff) | |
| download | linux-5e670d844b2a4e47d1b9b9aceb14dd3c12a6d4bf.tar.bz2 | |
net/ipv6: Move nexthop data to fib6_nh
Introduce fib6_nh structure and move nexthop related data from
rt6_info and rt6_info.dst to fib6_nh. References to dev, gateway or
lwtstate from a FIB lookup perspective are converted to use fib6_nh;
datapath references to dst version are left as is.
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 1130a1144dfd..655e13017a45 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -273,10 +273,10 @@ static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt, static inline bool rt6_duplicate_nexthop(struct rt6_info *a, struct rt6_info *b) { - return a->dst.dev == b->dst.dev && + return a->fib6_nh.nh_dev == b->fib6_nh.nh_dev && a->rt6i_idev == b->rt6i_idev && - ipv6_addr_equal(&a->rt6i_gateway, &b->rt6i_gateway) && - !lwtunnel_cmp_encap(a->dst.lwtstate, b->dst.lwtstate); + 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); } #endif |