diff options
| author | David Miller <davem@davemloft.net> | 2017-11-28 23:40:15 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-30 17:54:25 +0300 |
| commit | 071fb37ec43dcd88937a669c5f97bd37f7d29dea (patch) | |
| tree | 0617fefbad2dd509cdd916c72407124d7dfddce3 /include/net | |
| parent | fe736e778c604dee8f02d3381dfadba8d621605e (diff) | |
| download | linux-071fb37ec43dcd88937a669c5f97bd37f7d29dea.tar.xz | |
ipv6: Move rt6_next from dst_entry into ipv6 route structure.
Signed-off-by: David S. Miller <davem@davemloft.net>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/dst.h | 1 | ||||
| -rw-r--r-- | include/net/ip6_fib.h | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index cc7e8166be0d..acbb3fb89c4d 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -101,7 +101,6 @@ struct dst_entry { struct lwtunnel_state *lwtstate; union { struct dst_entry *next; - struct rt6_info __rcu *rt6_next; }; }; diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 10c913816032..281a922f0c62 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -129,6 +129,7 @@ struct rt6_exception { struct rt6_info { struct dst_entry dst; + struct rt6_info __rcu *rt6_next; /* * Tail elements of dst_entry (__refcnt etc.) @@ -176,11 +177,11 @@ struct rt6_info { #define for_each_fib6_node_rt_rcu(fn) \ for (rt = rcu_dereference((fn)->leaf); rt; \ - rt = rcu_dereference(rt->dst.rt6_next)) + rt = rcu_dereference(rt->rt6_next)) #define for_each_fib6_walker_rt(w) \ for (rt = (w)->leaf; rt; \ - rt = rcu_dereference_protected(rt->dst.rt6_next, 1)) + rt = rcu_dereference_protected(rt->rt6_next, 1)) static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst) { |