ipv6: clean up ipv6_dev_ac_inc()

Make it accept inet6_dev, and rename it to __ipv6_dev_ac_inc()
to reflect this change.

Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index f679877bb6017dd4a6da7d1fe0e6ea217ba3b3e4..9b1d42e66cca35b610f6fbb61de7e9dab3900b32 100644 (file)
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -202,7 +202,7 @@ int ipv6_sock_ac_drop(struct sock *sk, int ifindex,
                      const struct in6_addr *addr);
 void ipv6_sock_ac_close(struct sock *sk);
 
-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);
 int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr);
 bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev,
                         const struct in6_addr *addr);

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index ad4598fcc416cde41211fd466b2b259d6cb98dc9..6b6a373a30b249b26c5793d98a9098596a019764 100644 (file)
--- 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 d10f2e2b49c68526d55a405254b56ab4aeb52af6..66c19320119a06167afdbc783ab8ec8f80f22515 100644 (file)
--- 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;