Merge tag 'ktest-fix-make-min-failed-build-for-real' of git://git.kernel.org/pub...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / ipv6 / anycast.c

diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index fc1cdcd..59402b4 100644 (file)
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -83,7 +83,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
 
                rt = rt6_lookup(net, addr, NULL, 0, 0);
                if (rt) {
-                       dev = rt->rt6i_dev;
+                       dev = rt->dst.dev;
                        dst_release(&rt->dst);
                } else if (ishost) {
                        err = -EADDRNOTAVAIL;
@@ -289,7 +289,7 @@ int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr)
                goto out;
        }
 
-       rt = addrconf_dst_alloc(idev, addr, 1);
+       rt = addrconf_dst_alloc(idev, addr, true);
        if (IS_ERR(rt)) {
                kfree(aca);
                err = PTR_ERR(rt);