2 files changed, 5 insertions, 10 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index ad4598fcc416..6b6a373a30b2 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1725,7 +1725,7 @@ static void addrconf_join_anycast(struct inet6_ifaddr *ifp)
         ipv6_addr_prefix(&addr, &ifp->addr, ifp->prefix_len);
         if (ipv6_addr_any(&addr))
                 return;
-        ipv6_dev_ac_inc(ifp->idev->dev, &addr);
+        __ipv6_dev_ac_inc(ifp->idev, &addr);
 }
 
 /* caller must hold RTNL */
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index d10f2e2b49c6..66c19320119a 100644
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -122,7 +122,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
                         goto error;
         }
 
-        err = ipv6_dev_ac_inc(dev, addr);
+        err = __ipv6_dev_ac_inc(idev, addr);
         if (!err) {
                 pac->acl_next = np->ipv6_ac_list;
                 np->ipv6_ac_list = pac;
@@ -215,20 +215,15 @@ static void aca_put(struct ifacaddr6 *ac)
 /*
  *      device anycast group inc (add if not found)
  */
-int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr)
+int __ipv6_dev_ac_inc(struct inet6_dev *idev, const struct in6_addr *addr)
 {
         struct ifacaddr6 *aca;
-        struct inet6_dev *idev;
         struct rt6_info *rt;
         int err;
 
         ASSERT_RTNL();
 
-        idev = in6_dev_get(dev);
-
-        if (idev == NULL)
-                return -EINVAL;
-
+        in6_dev_hold(idev);
         write_lock_bh(&idev->lock);
         if (idev->dead) {
                 err = -ENODEV;
@@ -276,7 +271,7 @@ int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr)
 
         ip6_ins_rt(rt);
 
-        addrconf_join_solict(dev, &aca->aca_addr);
+        addrconf_join_solict(idev->dev, &aca->aca_addr);
 
         aca_put(aca);
         return 0;