diff options
| author | David Ahern <dsahern@gmail.com> | 2018-04-18 15:39:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-19 15:40:13 -0400 |
| commit | 9ee8cbb2fd4a7d6f483a20c4b8e82d8b1cf685fa (patch) | |
| tree | 299163a7c5d2986f164615ba0655846ca8114a69 /include/net | |
| parent | 360a9887c8c01a715b2b4b131f7c7462f7cce576 (diff) | |
| download | op-kernel-dev-9ee8cbb2fd4a7d6f483a20c4b8e82d8b1cf685fa.zip op-kernel-dev-9ee8cbb2fd4a7d6f483a20c4b8e82d8b1cf685fa.tar.gz | |
net/ipv6: Remove aca_idev
aca_idev has only 1 user - inet6_fill_ifacaddr - and it only
wants the device index which can be extracted from the fib6_info
nexthop.
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/if_inet6.h | 1 | ||||
| -rw-r--r-- | include/net/ip6_fib.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h index d6089b2..db38925 100644 --- a/include/net/if_inet6.h +++ b/include/net/if_inet6.h @@ -143,7 +143,6 @@ struct ipv6_ac_socklist { struct ifacaddr6 { struct in6_addr aca_addr; - struct inet6_dev *aca_idev; struct fib6_info *aca_rt; struct ifacaddr6 *aca_next; int aca_users; diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 994dd67..bd11c99 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -410,6 +410,11 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt, struct nl_info *info, struct netlink_ext_ack *extack); int fib6_del(struct fib6_info *rt, struct nl_info *info); +static inline struct net_device *fib6_info_nh_dev(const struct fib6_info *f6i) +{ + return f6i->fib6_nh.nh_dev; +} + void inet6_rt_notify(int event, struct fib6_info *rt, struct nl_info *info, unsigned int flags); |
