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 /net/ipv6/addrconf.c | |
| parent | net/ipv6: Rename addrconf_dst_alloc (diff) | |
| download | linux-dev-9ee8cbb2fd4a7d6f483a20c4b8e82d8b1cf685fa.tar.xz linux-dev-9ee8cbb2fd4a7d6f483a20c4b8e82d8b1cf685fa.zip | |
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 '')
| -rw-r--r-- | net/ipv6/addrconf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index e6dd886f8f1f..6c42c5d5fafa 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -4817,9 +4817,10 @@ static int inet6_fill_ifmcaddr(struct sk_buff *skb, struct ifmcaddr6 *ifmca, static int inet6_fill_ifacaddr(struct sk_buff *skb, struct ifacaddr6 *ifaca, u32 portid, u32 seq, int event, unsigned int flags) { + struct net_device *dev = fib6_info_nh_dev(ifaca->aca_rt); + int ifindex = dev ? dev->ifindex : 1; struct nlmsghdr *nlh; u8 scope = RT_SCOPE_UNIVERSE; - int ifindex = ifaca->aca_idev->dev->ifindex; if (ipv6_addr_scope(&ifaca->aca_addr) & IFA_SITE) scope = RT_SCOPE_SITE; |