diff options
| author | David Ahern <dsahern@gmail.com> | 2019-04-30 16:45:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-05 09:47:16 +0200 |
| commit | a5995e7107eb3d9c44744d3cf47d49fabfef01f5 (patch) | |
| tree | 4cdde0098637ed6a22c17ff1988f118fd8508e73 /include/net/ip_fib.h | |
| parent | ipv4: Pass fib_nh_common to rt_cache_route (diff) | |
| download | linux-a5995e7107eb3d9c44744d3cf47d49fabfef01f5.tar.xz linux-a5995e7107eb3d9c44744d3cf47d49fabfef01f5.zip | |
ipv4: Move exception bucket to nh_common
Similar to the cached routes, make IPv4 exceptions accessible when
using an IPv6 nexthop struct with IPv4 routes. Simplify the exception
functions by passing in fib_nh_common since that is all it needs,
and then cleanup the call sites that have extraneous fib_nh conversions.
As with the cached routes this is a 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>
Diffstat (limited to 'include/net/ip_fib.h')
| -rw-r--r-- | include/net/ip_fib.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 659c5081c40b..d0e28f4ab099 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -100,6 +100,7 @@ struct fib_nh_common { /* v4 specific, but allows fib6_nh with v4 routes */ struct rtable __rcu * __percpu *nhc_pcpu_rth_output; struct rtable __rcu *nhc_rth_input; + struct fnhe_hash_bucket __rcu *nhc_exceptions; }; struct fib_nh { @@ -111,7 +112,6 @@ struct fib_nh { #endif __be32 nh_saddr; int nh_saddr_genid; - struct fnhe_hash_bucket __rcu *nh_exceptions; #define fib_nh_family nh_common.nhc_family #define fib_nh_dev nh_common.nhc_dev #define fib_nh_oif nh_common.nhc_oif |