diff options
| author | David Ahern <dsahern@gmail.com> | 2019-03-28 04:53:57 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-29 18:48:04 +0100 |
| commit | f1741730dd18828fe3ea5fa91c22f41cf001c625 (patch) | |
| tree | d3491ccb4fd5129cc45d364fda8b67f3e056c366 /include/net/ip6_fib.h | |
| parent | ipv6: Rename fib6_nh entries (diff) | |
| download | linux-f1741730dd18828fe3ea5fa91c22f41cf001c625.tar.xz linux-f1741730dd18828fe3ea5fa91c22f41cf001c625.zip | |
net: Add fib_nh_common and update fib_nh and fib6_nh
Add fib_nh_common struct with common nexthop attributes. Convert
fib_nh and fib6_nh to use it. Use macros to move existing
fib_nh_* references to the new nh_common.nhc_*.
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/ip6_fib.h')
| -rw-r--r-- | include/net/ip6_fib.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index aff8570725c8..58dbb4e82908 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -19,6 +19,7 @@ #include <linux/notifier.h> #include <net/dst.h> #include <net/flow.h> +#include <net/ip_fib.h> #include <net/netlink.h> #include <net/inetpeer.h> #include <net/fib_notifier.h> @@ -125,14 +126,7 @@ struct rt6_exception { #define FIB6_MAX_DEPTH 5 struct fib6_nh { - struct in6_addr fib_nh_gw6; - bool fib_nh_has_gw; - struct net_device *fib_nh_dev; - struct lwtunnel_state *fib_nh_lws; - - unsigned int fib_nh_flags; - atomic_t fib_nh_upper_bound; - int fib_nh_weight; + struct fib_nh_common nh_common; }; struct fib6_info { |