ipv4: Move cached routes to fib_nh_common
While the cached routes, nh_pcpu_rth_output and nh_rth_input, are IPv4 specific, a later patch wants to make them accessible for IPv6 nexthops with IPv4 routes using a fib6_nh. Move the cached routes from fib_nh to fib_nh_common and update references. Initialization of the cached entries is moved to fib_nh_common_init, and free is moved to fib_nh_common_release. Change in location only, from fib_nh up to fib_nh_common; no functional change intended. Signed-off-by: David Ahern <dsahern@gmail.com> Reviewed-by: Ido Schimmel <idosch@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
a734d1f4c2
commit
0f457a3662
@@ -96,6 +96,10 @@ struct fib_nh_common {
|
||||
|
||||
int nhc_weight;
|
||||
atomic_t nhc_upper_bound;
|
||||
|
||||
/* v4 specific, but allows fib6_nh with v4 routes */
|
||||
struct rtable __rcu * __percpu *nhc_pcpu_rth_output;
|
||||
struct rtable __rcu *nhc_rth_input;
|
||||
};
|
||||
|
||||
struct fib_nh {
|
||||
@@ -107,8 +111,6 @@ struct fib_nh {
|
||||
#endif
|
||||
__be32 nh_saddr;
|
||||
int nh_saddr_genid;
|
||||
struct rtable __rcu * __percpu *nh_pcpu_rth_output;
|
||||
struct rtable __rcu *nh_rth_input;
|
||||
struct fnhe_hash_bucket __rcu *nh_exceptions;
|
||||
#define fib_nh_family nh_common.nhc_family
|
||||
#define fib_nh_dev nh_common.nhc_dev
|
||||
|
Reference in New Issue
Block a user