diff options
| author | David Ahern | 2019-05-23 05:27:59 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-05-24 22:26:44 +0200 |
| commit | 1cf844c747d5424abe76f7b599c00b1ac17d3fce (patch) | |
| tree | ec68db9a13a743fafe2f3db3877226f7e5bd2cce /include/net/ip6_fib.h | |
| parent | ipv6: Move exception bucket to fib6_nh (diff) | |
| download | kernel-qcow2-linux-1cf844c747d5424abe76f7b599c00b1ac17d3fce.tar.gz kernel-qcow2-linux-1cf844c747d5424abe76f7b599c00b1ac17d3fce.tar.xz kernel-qcow2-linux-1cf844c747d5424abe76f7b599c00b1ac17d3fce.zip | |
ipv6: Make fib6_nh optional at the end of fib6_info
Move fib6_nh to the end of fib6_info and make it an array of
size 0. Pass a flag to fib6_info_alloc indicating if the
allocation needs to add space for a fib6_nh.
The current code path always has a fib6_nh allocated with a
fib6_info; with nexthop objects they will be separate.
Signed-off-by: David Ahern <dsahern@gmail.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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 6b4852cf2fc2..ebe5d65f97e0 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -169,8 +169,8 @@ struct fib6_info { fib6_destroying:1, unused:3; - struct fib6_nh fib6_nh; struct rcu_head rcu; + struct fib6_nh fib6_nh[0]; }; struct rt6_info { @@ -280,7 +280,7 @@ static inline void ip6_rt_put(struct rt6_info *rt) dst_release(&rt->dst); } -struct fib6_info *fib6_info_alloc(gfp_t gfp_flags); +struct fib6_info *fib6_info_alloc(gfp_t gfp_flags, bool with_fib6_nh); void fib6_info_destroy_rcu(struct rcu_head *head); static inline void fib6_info_hold(struct fib6_info *f6i) @@ -443,7 +443,7 @@ void rt6_get_prefsrc(const struct rt6_info *rt, struct in6_addr *addr) static inline struct net_device *fib6_info_nh_dev(const struct fib6_info *f6i) { - return f6i->fib6_nh.fib_nh_dev; + return f6i->fib6_nh->fib_nh_dev; } int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, |